From b8d6fb6e24708c782593b0e9c940871ae18573dc Mon Sep 17 00:00:00 2001 From: James Nunez Date: Wed, 1 Oct 2014 08:06:08 -0600 Subject: [PATCH] LU-4217 build: Remove ACL mount options The "acl" mount option on the client has been depricated since Lustre 1.8. The "acl" mount option code is now obsolete and is removed. Signed-off-by: James Nunez Change-Id: Ib765476a71ebb732d9ffda60b336530e0a758943 Reviewed-on: http://review.whamcloud.com/12154 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/llite/llite_lib.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 4d3508e..b1dec67 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -849,23 +849,6 @@ static int ll_options(char *options, int *flags) *flags &= ~tmp; goto next; } -#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 53, 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; - } -#endif tmp = ll_set_opt("remote_client", s1, LL_SBI_RMT_CLIENT); if (tmp) { *flags |= tmp; -- 1.8.3.1