2004-10-14 19:27:27

by Jeffrey Mahoney

Subject: [PATCH 2/2] 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 <[email protected]>

diff -ruPX dontdiff linux-2.6.8/fs/reiserfs/super.c linux-2.6.8.fix/fs/reiserfs/super.c
--- linux-2.6.8/fs/reiserfs/super.c 2004-10-08 16:46:09.070660248 -0400
+++ linux-2.6.8.fix/fs/reiserfs/super.c 2004-10-08 16:42:59.896419104 -0400
@@ -741,11 +747,19 @@
{"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},

2004-10-15 17:00:03

by Hans Reiser

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

Jeff's batch of patches are ok with me.