leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/lustre: KEY_DEFAULT/MAX_COOKIESIZE key is unused, remove them

Browse Source 
Also remove the lmv and mdc infrastructure to query these keys.
In fact this whole "unlink cookies" thing becomes irrelevant
with newer servers, but since we still retain 2.[123] servers
commpatibility, we cannot completely remove all traces of it yet.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oleg Drokin 2015-10-01 00:12:12 -04:00 committed by Greg Kroah-Hartman
parent db459e48f5
commit b27f9d185f
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/include/obd.h
View File

@ -840,8 +840,6 @@ enum obd_cleanup_stage {
#define KEY_LOV_IDX "lov_idx"
#define KEY_MAX_EASIZE "max_easize"
#define KEY_DEFAULT_EASIZE "default_easize"
#define KEY_MAX_COOKIESIZE "max_cookiesize"
#define KEY_DEFAULT_COOKIESIZE "default_cookiesize"
#define KEY_MDS_CONN "mds_conn"
#define KEY_MGSSEC "mgssec"
#define KEY_NEXT_ID "next_id"

2
drivers/staging/lustre/lustre/lmv/lmv_obd.c
View File

@ -2322,8 +2322,6 @@ static int lmv_get_info(const struct lu_env *env, struct obd_export *exp,
return -EINVAL;
} else if (KEY_IS(KEY_MAX_EASIZE) ||
KEY_IS(KEY_DEFAULT_EASIZE) ||
KEY_IS(KEY_MAX_COOKIESIZE) ||
KEY_IS(KEY_DEFAULT_COOKIESIZE) ||
KEY_IS(KEY_CONN_DATA)) {
rc = lmv_check_connect(obd);
if (rc)

20
drivers/staging/lustre/lustre/mdc/mdc_request.c
View File

@ -2124,26 +2124,6 @@ static int mdc_get_info(const struct lu_env *env, struct obd_export *exp,
default_easize = val;
*default_easize = exp->exp_obd->u.cli.cl_default_mds_easize;
return 0;
} else if (KEY_IS(KEY_MAX_COOKIESIZE)) {
int mdsize, *max_cookiesize;
if (*vallen != sizeof(int))
return -EINVAL;
mdsize = *(int *)val;
if (mdsize > exp->exp_obd->u.cli.cl_max_mds_cookiesize)
exp->exp_obd->u.cli.cl_max_mds_cookiesize = mdsize;
max_cookiesize = val;
*max_cookiesize = exp->exp_obd->u.cli.cl_max_mds_cookiesize;
return 0;
} else if (KEY_IS(KEY_DEFAULT_COOKIESIZE)) {
int *default_cookiesize;
if (*vallen != sizeof(int))
return -EINVAL;
default_cookiesize = val;
*default_cookiesize =
exp->exp_obd->u.cli.cl_default_mds_cookiesize;
return 0;
} else if (KEY_IS(KEY_CONN_DATA)) {
struct obd_import *imp = class_exp2cliimp(exp);
struct obd_connect_data *data = val;