jffs2: Remove jffs2_{get,set,remove}xattr macros

When CONFIG_JFFS2_FS_XATTR is off, jffs2_xattr_handlers is defined as
NULL. With sb->s_xattr == NULL, the generic_{get,set,remove}xattr
functions produce the same result as setting the {get,set,remove}xattr
inode operations to NULL, so there is no need for these macros.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

4 files changed, 9 insertions, 15 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 30eb33ff8189..8aa2f8936c3a 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -61,10 +61,10 @@ const struct inode_operations jffs2_dir_inode_operations =
         .get_acl =      jffs2_get_acl,
         .set_acl =      jffs2_set_acl,
         .setattr =      jffs2_setattr,
-        .setxattr =     jffs2_setxattr,
-        .getxattr =     jffs2_getxattr,
+        .setxattr =     generic_setxattr,
+        .getxattr =     generic_getxattr,
         .listxattr =    jffs2_listxattr,
-        .removexattr =  jffs2_removexattr
+        .removexattr =  generic_removexattr
 };
 
 /***********************************************************************/
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 0e62dec3effc..fdf9e1cb2e48 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -66,10 +66,10 @@ const struct inode_operations jffs2_file_inode_operations =
         .get_acl =      jffs2_get_acl,
         .set_acl =      jffs2_set_acl,
         .setattr =      jffs2_setattr,
-        .setxattr =     jffs2_setxattr,
-        .getxattr =     jffs2_getxattr,
+        .setxattr =     generic_setxattr,
+        .getxattr =     generic_getxattr,
         .listxattr =    jffs2_listxattr,
-        .removexattr =  jffs2_removexattr
+        .removexattr =  generic_removexattr
 };
 
 const struct address_space_operations jffs2_file_address_operations =
diff --git a/fs/jffs2/symlink.c b/fs/jffs2/symlink.c
index 2cabd649d4fb..afe2d75ae395 100644
--- a/fs/jffs2/symlink.c
+++ b/fs/jffs2/symlink.c
@@ -16,8 +16,8 @@ const struct inode_operations jffs2_symlink_inode_operations =
         .readlink =     generic_readlink,
         .get_link =     simple_get_link,
         .setattr =      jffs2_setattr,
-        .setxattr =     jffs2_setxattr,
-        .getxattr =     jffs2_getxattr,
+        .setxattr =     generic_setxattr,
+        .getxattr =     generic_getxattr,
         .listxattr =    jffs2_listxattr,
-        .removexattr =  jffs2_removexattr
+        .removexattr =  generic_removexattr
 };
diff --git a/fs/jffs2/xattr.h b/fs/jffs2/xattr.h
index 467ff376ee26..720007b2fd65 100644
--- a/fs/jffs2/xattr.h
+++ b/fs/jffs2/xattr.h
@@ -99,9 +99,6 @@ extern const struct xattr_handler jffs2_user_xattr_handler;
 extern const struct xattr_handler jffs2_trusted_xattr_handler;
 
 extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);
-#define jffs2_getxattr          generic_getxattr
-#define jffs2_setxattr          generic_setxattr
-#define jffs2_removexattr       generic_removexattr
 
 #else
 
@@ -116,9 +113,6 @@ extern ssize_t jffs2_listxattr(struct dentry *, char *, size_t);
 
 #define jffs2_xattr_handlers    NULL
 #define jffs2_listxattr         NULL
-#define jffs2_getxattr          NULL
-#define jffs2_setxattr          NULL
-#define jffs2_removexattr       NULL
 
 #endif /* CONFIG_JFFS2_FS_XATTR */