Commit 13a7de7b authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: get rid of deprecaed acl mount option code 



This is long since unused code, so get rid of it.

Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0237d9dc

drivers/staging/lustre/lustre/llite/llite_lib.c

+0 −19
Original line number Diff line number Diff line
@@ -818,25 +818,6 @@ 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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE