diff options
| author | Oleg Drokin <green@linuxhacker.ru> | 2014-10-11 22:46:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:21:55 +0800 |
| commit | 13a7de7bbc7c43dc6c4b16b60034a926aa436277 (patch) | |
| tree | 40831692fbdadca8da77eed5eb7b8e59cb1a3893 /drivers/staging/lustre | |
| parent | 0237d9dc94b6e5f1e31c0db90bce6301d0884350 (diff) | |
| download | op-kernel-dev-13a7de7bbc7c43dc6c4b16b60034a926aa436277.zip op-kernel-dev-13a7de7bbc7c43dc6c4b16b60034a926aa436277.tar.gz | |
staging/lustre: get rid of deprecaed acl mount option code
This is long since unused code, so get rid of it.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/llite_lib.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index 74cd451..afb433a 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -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; |
