From: Gui Hecheng <guihecheng@cmss.chinamobile.com>
Date: Fri, 31 Mar 2017 02:42:40 +0000 (+0800)
Subject: rgw_file: fix missing unlock in unlink
X-Git-Tag: v10.2.8~72^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16eeb8c2acc8a1f843fa87967c2ee4c0ed2cd8bd;p=ceph.git

rgw_file: fix missing unlock in unlink

Fixes: http://tracker.ceph.com/issues/19435

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
(cherry picked from commit cb6808a6366a70f54d0cc16437d16aa1b7819c84)
---

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index 2e084a6add06..77a29836e183 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -270,6 +270,8 @@ namespace rgw {
 	/* for the duration of our cache timer, trust positive
 	 * child cache */
 	if (rgw_fh->has_children()) {
+	  rgw_fh->mtx.unlock();
+	  unref(rgw_fh);
 	  return(-ENOTEMPTY);
 	}
 	oname += "/";