Commit 811308bb authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds

[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: default avatarJeff Mahoney <jeffm@novell.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 93d435ff
...@@ -750,11 +750,19 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st ...@@ -750,11 +750,19 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
{"conv", .setmask = 1<<REISERFS_CONVERT}, {"conv", .setmask = 1<<REISERFS_CONVERT},
{"attrs", .setmask = 1<<REISERFS_ATTRS}, {"attrs", .setmask = 1<<REISERFS_ATTRS},
{"noattrs", .clrmask = 1<<REISERFS_ATTRS}, {"noattrs", .clrmask = 1<<REISERFS_ATTRS},
#ifdef CONFIG_REISERFS_FS_XATTR
{"user_xattr", .setmask = 1<<REISERFS_XATTRS_USER}, {"user_xattr", .setmask = 1<<REISERFS_XATTRS_USER},
{"nouser_xattr",.clrmask = 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 #ifdef CONFIG_REISERFS_FS_POSIX_ACL
{"acl", .setmask = 1<<REISERFS_POSIXACL}, {"acl", .setmask = 1<<REISERFS_POSIXACL},
{"noacl", .clrmask = 1<<REISERFS_POSIXACL}, {"noacl", .clrmask = 1<<REISERFS_POSIXACL},
#else
{"acl", .setmask = 1<<REISERFS_UNSUPPORTED_OPT},
{"noacl", .clrmask = 1<<REISERFS_UNSUPPORTED_OPT},
#endif #endif
{"nolog",}, /* This is unsupported */ {"nolog",}, /* This is unsupported */
{"replayonly", .setmask = 1<<REPLAYONLY}, {"replayonly", .setmask = 1<<REPLAYONLY},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment