From bac642990e8242d2d5ff9732dba1a806dcc0811d Mon Sep 17 00:00:00 2001 From: yury Date: Mon, 13 Jun 2005 13:24:56 +0000 Subject: [PATCH] - removed canceling unused locks in cobd in switching time as this is done in disconnect path. --- lustre/cobd/cache_obd.c | 14 -------------- lustre/include/linux/lustre_dlm.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c index 4e56ce0..e0a3043 100644 --- a/lustre/cobd/cache_obd.c +++ b/lustre/cobd/cache_obd.c @@ -787,13 +787,6 @@ static int cobd_iocontrol(unsigned int cmd, struct obd_export *exp, if (!cobd->cache_on) { struct lustre_handle conn = {0}; - rc = obd_cancel_unused(cobd->master_real_exp, NULL, - LDLM_FL_COBD_SWITCH, NULL); - if (rc) { - CWARN("can't cancel unused locks on master export, " - "err %d\n", rc); - } - rc = client_obd_disconnect(obd, cobd->master_real_exp, 0); if (rc) { CWARN("can't disconnect master export, err %d\n", @@ -820,13 +813,6 @@ static int cobd_iocontrol(unsigned int cmd, struct obd_export *exp, easize = cache->u.cli.cl_max_mds_easize; cooksize = cache->u.cli.cl_max_mds_cookiesize; - rc = obd_cancel_unused(cobd->cache_real_exp, NULL, - LDLM_FL_COBD_SWITCH, NULL); - if (rc) { - CWARN("can't cancel unused locks on cache export, " - "err %d\n", rc); - } - rc = client_obd_disconnect(obd, cobd->cache_real_exp, 0); if (rc) { CWARN("can't disconnect cache export, err %d\n", diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index c0c5ea0..2c44a3d6 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -75,8 +75,6 @@ typedef enum { /* file & record locking */ #define LDLM_FL_BLOCK_NOWAIT 0x040000 /* server told not to wait if blocked */ #define LDLM_FL_TEST_LOCK 0x080000 /* return blocking lock */ -#define LDLM_FL_COBD_SWITCH 0x100000 /* not used yet, but logicaly we have to - * distinguish diff. situations. */ /* These are flags that are mapped into the flags and ASTs of blocking locks */ #define LDLM_AST_DISCARD_DATA 0x80000000 /* Add FL_DISCARD to blocking ASTs */ -- 1.8.3.1