Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[net-next-2.6.git] / fs / ocfs2 / dlmfs / dlmfs.c

diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index a43ebb11ad3b9eecb0986891229f51c8299a3913..c2903b84bb7a8ccbc0ea099e4a8585559d3fcf67 100644 (file)
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -182,8 +182,7 @@ static int dlmfs_file_release(struct inode *inode,
 {
        int level, status;
        struct dlmfs_inode_private *ip = DLMFS_I(inode);
-       struct dlmfs_filp_private *fp =
-               (struct dlmfs_filp_private *) file->private_data;
+       struct dlmfs_filp_private *fp = file->private_data;
 
        if (S_ISDIR(inode->i_mode))
                BUG();