From: "John L. Hammond" <john.hamm...@intel.com> The landing of clio #if 0-ed out some regions of echo_client.c. Just remove these regions entirely.
Signed-off-by: John L. Hammond <john.hamm...@intel.com> Reviewed-on: http://review.whamcloud.com/5580 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-2675 Reviewed-by: James Simmons <uja.o...@gmail.com> Reviewed-by: Andreas Dilger <andreas.dil...@intel.com> Reviewed-by: Oleg Drokin <oleg.dro...@intel.com> --- .../staging/lustre/lustre/obdecho/echo_client.c | 50 ---------------------- 1 file changed, 50 deletions(-) diff --git a/drivers/staging/lustre/lustre/obdecho/echo_client.c b/drivers/staging/lustre/lustre/obdecho/echo_client.c index 68a5ed1..98e4290 100644 --- a/drivers/staging/lustre/lustre/obdecho/echo_client.c +++ b/drivers/staging/lustre/lustre/obdecho/echo_client.c @@ -93,16 +93,6 @@ struct echo_lock { atomic_t el_refcount; }; -struct echo_io { - struct cl_io_slice ei_cl; -}; - -#if 0 -struct echo_req { - struct cl_req_slice er_cl; -}; -#endif - static int echo_client_setup(const struct lu_env *env, struct obd_device *obddev, struct lustre_cfg *lcfg); @@ -200,7 +190,6 @@ static struct kmem_cache *echo_lock_kmem; static struct kmem_cache *echo_object_kmem; static struct kmem_cache *echo_thread_kmem; static struct kmem_cache *echo_session_kmem; -//static struct kmem_cache *echo_req_kmem; static struct lu_kmem_descr echo_caches[] = { { @@ -223,13 +212,6 @@ static struct lu_kmem_descr echo_caches[] = { .ckd_name = "echo_session_kmem", .ckd_size = sizeof (struct echo_session_info) }, -#if 0 - { - .ckd_cache = &echo_req_kmem, - .ckd_name = "echo_req_kmem", - .ckd_size = sizeof (struct echo_req) - }, -#endif { .ckd_cache = NULL } @@ -2100,37 +2082,11 @@ static int echo_client_connect(const struct lu_env *env, static int echo_client_disconnect(struct obd_export *exp) { -#if 0 - struct obd_device *obd; - struct echo_client_obd *ec; - struct ec_lock *ecl; -#endif int rc; if (exp == NULL) GOTO(out, rc = -EINVAL); -#if 0 - obd = exp->exp_obd; - ec = &obd->u.echo_client; - - /* no more contention on export's lock list */ - while (!list_empty (&exp->exp_ec_data.eced_locks)) { - ecl = list_entry (exp->exp_ec_data.eced_locks.next, - struct ec_lock, ecl_exp_chain); - list_del (&ecl->ecl_exp_chain); - - rc = obd_cancel(ec->ec_exp, ecl->ecl_object->eco_lsm, - ecl->ecl_mode, &ecl->ecl_lock_handle); - - CDEBUG (D_INFO, "Cancel lock on object %#llx on disconnect " - "(%d)\n", ecl->ecl_object->eco_id, rc); - - echo_put_object (ecl->ecl_object); - OBD_FREE (ecl, sizeof (*ecl)); - } -#endif - rc = class_disconnect(exp); GOTO(out, rc); out: @@ -2139,12 +2095,6 @@ static int echo_client_disconnect(struct obd_export *exp) static struct obd_ops echo_client_obd_ops = { .o_owner = THIS_MODULE, - -#if 0 - .o_setup = echo_client_setup, - .o_cleanup = echo_client_cleanup, -#endif - .o_iocontrol = echo_client_iocontrol, .o_connect = echo_client_connect, .o_disconnect = echo_client_disconnect -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
