]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33005 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Feb 2020 00:38:34 +0000 (16:38 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 18 Feb 2020 00:38:34 +0000 (16:38 -0800)
commit00c6963bc4797a3d7b9999605d6723352ad42683
tree3e7c7f8ff8d0cad5a675f7b5f9c6014088062a9b
parentfeaa3af62bf7ae00a3f8da30ae1c76a0dc5fd411
parent0705a831b6fa3592caf22e9a2ed49ac959a950d2
Merge PR #33005 into master

* refs/pull/33005/head:
mds: fix 'can wrlock' check in Locker::acquire_locks()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Locker.cc
src/mds/Locker.h