From e686e57bada3cbcd0fe447b95b76a49d988c2ceb Mon Sep 17 00:00:00 2001 From: Bob Glossman Date: Thu, 17 Sep 2015 11:34:01 -0700 Subject: [PATCH] LU-7063 llog: fix leak of lock in llog_ost_destroy() Previous fix http://review.whamcloud.com/#/c/15730/7/lustre/obdclass/llog_osd.c. introduced the leak of a lock in the case of an error return from llog_osd_dir_get(). This fixes that error path. Signed-off-by: Bob Glossman Change-Id: I38f709c5805e23322de988065c83e1a8079bded6 Reviewed-on: http://review.whamcloud.com/16471 Tested-by: Jenkins Reviewed-by: Mike Pershin Reviewed-by: James Simmons Reviewed-by: Andreas Dilger Tested-by: Maloo --- lustre/obdclass/llog_osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c index 53c9d3b..8dc6c40 100644 --- a/lustre/obdclass/llog_osd.c +++ b/lustre/obdclass/llog_osd.c @@ -1674,7 +1674,7 @@ static int llog_osd_destroy(const struct lu_env *env, if (loghandle->lgh_name) { llog_dir = llog_osd_dir_get(env, ctxt); if (IS_ERR(llog_dir)) - RETURN(PTR_ERR(llog_dir)); + GOTO(out_unlock, rc = PTR_ERR(llog_dir)); dt_read_lock(env, llog_dir, 0); rc = dt_delete(env, llog_dir, -- 1.8.3.1