From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 18 Feb 2020 00:38:34 +0000 (-0800)
Subject: Merge PR #33005 into master
X-Git-Tag: v15.1.1~385
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=00c6963bc4797a3d7b9999605d6723352ad42683;p=ceph-ci.git

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>
---

00c6963bc4797a3d7b9999605d6723352ad42683