From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 18 Jul 2020 03:28:50 +0000 (-0700)
Subject: Merge PR #36097 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~625
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a43122b716bd535b28489ee74a533e247c88d256;p=ceph-ci.git

Merge PR #36097 into master

* refs/pull/36097/head:
	mds: fix nullptr dereference in MDCache::finish_rollback

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

a43122b716bd535b28489ee74a533e247c88d256
diff --cc src/mds/MDCache.cc
index 28a7e2b7ae8,f6ba2d4aacb..8ffca3d2b9c
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@@ -3605,15 -3605,15 +3605,15 @@@ MDPeerUpdate* MDCache::get_uncommitted_
  }
  
  void MDCache::finish_rollback(metareqid_t reqid, MDRequestRef& mdr) {
-   auto p = resolve_need_rollback.find(mdr->reqid);
+   auto p = resolve_need_rollback.find(reqid);
    ceph_assert(p != resolve_need_rollback.end());
    if (mds->is_resolve()) {
 -    finish_uncommitted_slave(reqid, false);
 +    finish_uncommitted_peer(reqid, false);
    } else if (mdr) {
 -    finish_uncommitted_slave(mdr->reqid, mdr->more()->slave_update_journaled);
 +    finish_uncommitted_peer(mdr->reqid, mdr->more()->peer_update_journaled);
    }
    resolve_need_rollback.erase(p);
 -  maybe_finish_slave_resolve();
 +  maybe_finish_peer_resolve();
  }
  
  void MDCache::disambiguate_other_imports()