From: Li Wei <wei.g.li@intel.com>
Date: Wed, 24 Sep 2014 09:09:48 +0000 (+0800)
Subject: LU-5654 osp: Call obd_fid_fini() on osp_init0() error path
X-Git-Tag: 2.6.91~78
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=88fe67803334531c848c2a3771d1c6ac412227db

LU-5654 osp: Call obd_fid_fini() on osp_init0() error path

osp_init0() should call obd_fid_fini() on its error path to avoid
leaks.

Change-Id: I1a679db172ae60c74049d2dd3e111c93cfcbeda2
Signed-off-by: Li Wei <wei.g.li@intel.com>
Reviewed-on: http://review.whamcloud.com/12037
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Johann Lombardi <johann.lombardi@intel.com>
---

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index 41c7513..61e697f 100644
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -1021,7 +1021,7 @@ static int osp_init0(const struct lu_env *env, struct osp_device *osp,
 		 * used in orphan cleanup. */
 		rc = osp_last_used_init(env, osp);
 		if (rc)
-			GOTO(out_proc, rc);
+			GOTO(out_fid, rc);
 
 
 		/* Initialize precreation thread, it handles new
@@ -1065,6 +1065,8 @@ out_precreat:
 out_last_used:
 	if (!osp->opd_connect_mdt)
 		osp_last_used_fini(env, osp);
+out_fid:
+	obd_fid_fini(osp->opd_obd);
 out_proc:
 	ptlrpc_lprocfs_unregister_obd(obd);
 	lprocfs_obd_cleanup(obd);