From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 22 Feb 2021 17:33:28 +0000 (-0800)
Subject: Merge pull request #39313 from neha-ojha/wip-49156-pacific
X-Git-Tag: v16.2.0~188
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=588654a6d452e6146981686751ce09fd0bc3533f;p=ceph.git

Merge pull request #39313 from neha-ojha/wip-49156-pacific

pacific: osd: fix to call nullptr when cancel_manifest_ops

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

588654a6d452e6146981686751ce09fd0bc3533f