summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
diff options
context:
space:
mode:
authorSwapnil Pimpale <spimpale@ddn.com>2016-04-27 21:37:14 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-28 21:53:18 -0700
commitd8555069e259a7fd8096527cab5b9e3dbf185225 (patch)
treeeadabd07ab97a5cc25d84f7758ee90dc94c58dd2 /drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
parent6956583961fbd837b381d64e48e67c64b147989a (diff)
downloadop-kernel-dev-d8555069e259a7fd8096527cab5b9e3dbf185225.zip
op-kernel-dev-d8555069e259a7fd8096527cab5b9e3dbf185225.tar.gz
staging: lustre: obd: cleanup client import if client_obd_setup fails
client_obd_setup() allocates an obd_import which should be cleaned up if there is any failure afterwards in callers of client_obd_setup(). This patch fixes the bug in osc_setup(), mgc_setup(), mdc_setup() and lwp_setup(). The fix is to call obd_cleanup_client_import() before calling client_obd_cleanup() in case of an error. Signed-off-by: Swapnil Pimpale <spimpale@ddn.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3810 Reviewed-on: http://review.whamcloud.com/7561 Reviewed-by: John L. Hammond <john.hammond@intel.com> Reviewed-by: Lai Siyao <lai.siyao@intel.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/ldlm/ldlm_lib.c')
-rw-r--r--drivers/staging/lustre/lustre/ldlm/ldlm_lib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
index 32486b2..4791136 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lib.c
@@ -438,6 +438,7 @@ int client_obd_cleanup(struct obd_device *obddev)
ldlm_namespace_free_post(obddev->obd_namespace);
obddev->obd_namespace = NULL;
+ obd_cleanup_client_import(obddev);
LASSERT(!obddev->u.cli.cl_import);
ldlm_put_ref();
OpenPOWER on IntegriCloud