[PATCH] reiserfs: allow user_xattr and acl options to be ignored, with warning

This patch uses the REISERFS_UNSUPPORTED_OPT flag to denote -o(no)acl, and
-o(no)user_xattr as unsupported, but allowable, when support isn't built
into the kernel.

Signed-off-by: Jeff Mahoney <jeffm@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index b96aa702660ed4e448e81db9e4b561aaa0b4745e..38b10fdbc3e1c770054af70d0b53cae2de15c2af 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -750,11 +750,19 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
        {"conv",        .setmask = 1<<REISERFS_CONVERT},
        {"attrs",       .setmask = 1<<REISERFS_ATTRS},
        {"noattrs",     .clrmask = 1<<REISERFS_ATTRS},
+#ifdef CONFIG_REISERFS_FS_XATTR
        {"user_xattr",  .setmask = 1<<REISERFS_XATTRS_USER},
        {"nouser_xattr",.clrmask = 1<<REISERFS_XATTRS_USER},
+#else
+       {"user_xattr",  .setmask = 1<<REISERFS_UNSUPPORTED_OPT},
+       {"nouser_xattr",.clrmask = 1<<REISERFS_UNSUPPORTED_OPT},
+#endif
 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
        {"acl",         .setmask = 1<<REISERFS_POSIXACL},
        {"noacl",       .clrmask = 1<<REISERFS_POSIXACL},
+#else
+       {"acl",         .setmask = 1<<REISERFS_UNSUPPORTED_OPT},
+       {"noacl",       .clrmask = 1<<REISERFS_UNSUPPORTED_OPT},
 #endif
        {"nolog",},      /* This is unsupported */
        {"replayonly",  .setmask = 1<<REPLAYONLY},