From: Andreas Dilger <andreas.dilger@oracle.com>
Date: Tue, 15 Jun 2010 22:58:21 +0000 (-0600)
Subject: b=16208 Report deprecated options, so they are removed from /etc/fstab.
X-Git-Tag: v2_0_0-rc1~39
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ef178d38c83bef433c2d1dc3f287ba5fa17b5c24;p=fs%2Flustre-release.git

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
---

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");