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 2e084a6add06ea08914eee3f0caec421f8d936ca..77a29836e18366370010d201a0b52764f9381e6e 100644 (file)
--- 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 += "/";