From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 4 Mar 2020 12:58:07 +0000 (+0800)
Subject: mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()
X-Git-Tag: v15.2.0~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=776389ae72837bfbc14568f08ee42023acd3879f;p=ceph-ci.git

mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()

Current code pass SimpleLock pointer to Locker::wrlock_start().
Compiler constructs a temp LockOp with flags == 0.

This patch also changes definition of Locker::wrlock_start(),
prevent compiler from doing this in the future.

Fixes: https://tracker.ceph.com/issues/44416
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
---

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index f8f99342c47..a42945bb27a 100644
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -542,7 +542,7 @@ bool Locker::acquire_locks(MDRequestRef& mdr,
 	    goto out;
 	  }
 	} else {
-	  if (!wrlock_start(lock, mdr)) {
+	  if (!wrlock_start(p, mdr)) {
 	    ceph_assert(!p.is_remote_wrlock());
 	    marker.message = "failed to wrlock, waiting";
 	    goto out;