]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mds: pass proper MutationImpl::LockOp to Locker::wrlock_start()
authorYan, Zheng <zyan@redhat.com>
Wed, 4 Mar 2020 12:58:07 +0000 (20:58 +0800)
committerYan, Zheng <zyan@redhat.com>
Thu, 12 Mar 2020 03:02:46 +0000 (11:02 +0800)
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>
src/mds/Locker.cc

index f8f99342c477c02ed2a0b9689d5e79b4af2fe05c..a42945bb27a215c34bdfec103fb9b18147837c54 100644 (file)
@@ -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;