]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_file: fix missing unlock in unlink 14262/head
authorGui Hecheng <guihecheng@cmss.chinamobile.com>
Fri, 31 Mar 2017 02:42:40 +0000 (10:42 +0800)
committerGui Hecheng <guihecheng@cmss.chinamobile.com>
Fri, 31 Mar 2017 02:50:13 +0000 (10:50 +0800)
Fixes: http://tracker.ceph.com/issues/19435
Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
src/rgw/rgw_file.cc

index 990ebe60d93c1ec6d810cc19e69134756341d521..0c6b1fd2d19fcb91efc3642ae01b1a269a8cb416 100644 (file)
@@ -281,6 +281,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 += "/";