]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw_file: conditionally unlink handles when direct deleted 21438/head
authorMatt Benjamin <mbenjamin@redhat.com>
Sat, 10 Mar 2018 20:25:56 +0000 (15:25 -0500)
committerPrashant D <pdhange@redhat.com>
Mon, 16 Apr 2018 03:38:34 +0000 (23:38 -0400)
commit3068117e078268da3dc9adada1ffe887fa069eff
tree96a07f9bb6f7216eccb0c37f24e97fa61fcd8dfa
parentcc3f9af6c465f0d1207793aafd450b705546abc2
rgw_file: conditionally unlink handles when direct deleted

The deadlock fix in 3cf0880 deals correctly deals with the
recycle-path locking, but incorrectly removed handle table cleanup
in the !recycle-path case.

The conditional handle removal is predicated on not being in the
recycle path, so this cannot deadlock.

Fixes: http://tracker.ceph.com/issues/23299
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 2e0f35c57791818eac49974c85dd4dc8ed592c06)
src/rgw/rgw_file.cc