From ef178d38c83bef433c2d1dc3f287ba5fa17b5c24 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Tue, 15 Jun 2010 16:58:21 -0600 Subject: [PATCH] b=16208 Report deprecated options, so they are removed from /etc/fstab. This hunk of the patch was missed when the patch was originally landed. Don't print "acl" in ll_show_options(), since it isn't needed at all. Add #ifdef so the option parsing/messages are removed in the future. o=sheng.yang i=johann i=andreas.dilger --- lustre/llite/llite_lib.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 7fad1fc..6da620f 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -711,17 +711,25 @@ static int ll_options(char *options, int *flags) *flags &= ~tmp; goto next; } +#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2,5,50,0) tmp = ll_set_opt("acl", s1, LL_SBI_ACL); if (tmp) { /* Ignore deprecated mount option. The client will * always try to mount with ACL support, whether this * is used depends on whether server supports it. */ + LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated " + "mount option 'acl'.\n"); goto next; } tmp = ll_set_opt("noacl", s1, LL_SBI_ACL); if (tmp) { + LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated " + "mount option 'noacl'.\n"); goto next; } +#else +#warning "{no}acl options have been deprecated since 1.8, please remove them" +#endif tmp = ll_set_opt("remote_client", s1, LL_SBI_RMT_CLIENT); if (tmp) { *flags |= tmp; @@ -2082,9 +2090,6 @@ int ll_show_options(struct seq_file *seq, struct vfsmount *vfs) if (sbi->ll_flags & LL_SBI_USER_XATTR) seq_puts(seq, ",user_xattr"); - if (sbi->ll_flags & LL_SBI_ACL) - seq_puts(seq, ",acl"); - if (sbi->ll_flags & LL_SBI_LAZYSTATFS) seq_puts(seq, ",lazystatfs"); -- 1.8.3.1