* [PATCH 2/2] reiserfs: allow user_xattr and acl options to be ignored, with warning
@ 2004-10-14 18:54 Jeffrey Mahoney
2004-10-15 16:59 ` Hans Reiser
0 siblings, 1 reply; 2+ messages in thread
From: Jeffrey Mahoney @ 2004-10-14 18:54 UTC (permalink / raw)
To: Andrew Morton, Linux Kernel Mailing List; +Cc: Hans Reiser
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>
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},
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2/2] reiserfs: allow user_xattr and acl options to be ignored, with warning
2004-10-14 18:54 [PATCH 2/2] reiserfs: allow user_xattr and acl options to be ignored, with warning Jeffrey Mahoney
@ 2004-10-15 16:59 ` Hans Reiser
0 siblings, 0 replies; 2+ messages in thread
From: Hans Reiser @ 2004-10-15 16:59 UTC (permalink / raw)
To: Jeffrey Mahoney; +Cc: Andrew Morton, Linux Kernel Mailing List
Jeff's batch of patches are ok with me.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-10-15 17:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-14 18:54 [PATCH 2/2] reiserfs: allow user_xattr and acl options to be ignored, with warning Jeffrey Mahoney
2004-10-15 16:59 ` Hans Reiser
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox