]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw_file: conditionally unlink handles when direct deleted 20834/head
authorMatt Benjamin <mbenjamin@redhat.com>
Sat, 10 Mar 2018 20:25:56 +0000 (15:25 -0500)
committerMatt Benjamin <mbenjamin@redhat.com>
Sat, 10 Mar 2018 21:09:28 +0000 (16:09 -0500)
commit2e0f35c57791818eac49974c85dd4dc8ed592c06
tree1100cc9e0e8dbf18d487ae248579671811b51eb9
parentedab41e3d6df1c6028b2f9beabe249276ddc79cf
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>
src/rgw/rgw_file.cc