Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1236951
| From | green@linuxhacker.ru |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 02/32] staging/lustre: KEY_DEFAULT/MAX_COOKIESIZE key is unused, remove them |
| Date | 2015-10-01 06:20 +0200 |
| Message-ID | <qeDvB-13Y-45@gated-at.bofh.it> (permalink) |
| References | <qeDvz-13Y-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Oleg Drokin <green@linuxhacker.ru>
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>
---
drivers/staging/lustre/lustre/include/obd.h | 2 --
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 2 --
drivers/staging/lustre/lustre/mdc/mdc_request.c | 20 --------------------
3 files changed, 24 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index 314f5c7..5de9776 100644
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -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"
diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index 8f0ffa4..7e6a060 100644
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -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)
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 8726176..dc234a7 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -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;
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/32] Lustre (mostly locking) unused code removal green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 21/32] staging/lustre/ldlm: Remove ldlm_refresh/del_waiting_lock() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 04/32] staging/lustre/llite: Remove unused ll_rmdir_entry() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 18/32] staging/lustre/ldlm: Remove ldlm_namespace_free() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 12/32] staging/lustre/ldlm: Remove unused ldlm_cli_enqueue_local() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 25/32] staging/lustre/ldlm: Remove unused ldlm_blocking_ast/_nocheck() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 06/32] staging/lustre/lov: Remove unused lov_lsm_decref() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 29/32] staging/lustre/ldlm: Remove unused exported symbols. green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 20/32] staging/lustre/ldlm: Remove unused ldlm_pool_set_slv() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 16/32] staging/lustre/ldlm: Remove ldlm_glimpse_ast() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 28/32] staging/lustre/ldlm: Remove server side code from pool support. green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 24/32] staging/lustre/ldlm: Remove unused ldlm_resource_insert_lock_after() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 19/32] staging/lustre/ldlm: Remove unused ldlm_pool_get_clv() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 30/32] staging/lustre/ldlm: Remove ldlm_namespace_inactive_list() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 05/32] staging/lustre/lov: Remove unused lov_dump_lmm/pool() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 02/32] staging/lustre: KEY_DEFAULT/MAX_COOKIESIZE key is unused, remove them green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 32/32] staging/lustre/ldlm: Make ldlm_add_ast_work_item() static green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 13/32] staging/lustre/ldlm: Remove unused ldlm_init/fini_flock_export green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 08/32] staging/lustre/ldlm: Remove unused ldlm_cancel_locks_for_exports() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 07/32] staging/lustre/ldlm: Remove unused interval tree bits green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 03/32] staging/lustre: Remove ununused ll_ra_read_get() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 14/32] staging/lustre/ldlm: Remove unused ldlm_enqueue_pack() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 26/32] staging/lustre: Remove ns_is_client() green@linuxhacker.ru - 2015-10-01 06:20 +0200 [PATCH 11/32] staging/lustre/ldlm: Get rid of lr_converting queue green@linuxhacker.ru - 2015-10-01 06:30 +0200 [PATCH 10/32] staging/lustre/ldlm: Remove unimplemented lock conversion traces. green@linuxhacker.ru - 2015-10-01 06:30 +0200
csiph-web