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

[mv-sheeva.git] / fs / ubifs / xattr.c

diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 3299f469e7126a004d2b3a37c5c2661b3c6a127d..16f19f55e63fa53e20dcc2cf520794b27b1290a7 100644 (file)
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -80,8 +80,8 @@ enum {
        SECURITY_XATTR,
 };
 
-static const struct inode_operations none_inode_operations;
-static const struct file_operations none_file_operations;
+static const struct inode_operations empty_iops;
+static const struct file_operations empty_fops;
 
 /**
  * create_xattr - create an extended attribute.
@@ -131,8 +131,8 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
 
        /* Re-define all operations to be "nothing" */
        inode->i_mapping->a_ops = &empty_aops;
-       inode->i_op = &none_inode_operations;
-       inode->i_fop = &none_file_operations;
+       inode->i_op = &empty_iops;
+       inode->i_fop = &empty_fops;
 
        inode->i_flags |= S_SYNC | S_NOATIME | S_NOCMTIME | S_NOQUOTA;
        ui = ubifs_inode(inode);