From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 24 Aug 2021 00:02:31 +0000 (-0400)
Subject: Merge PR #42371 into master
X-Git-Tag: v17.1.0~1039
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea0408778625106cd5e1346d1769aae09133fef3;p=ceph.git

Merge PR #42371 into master

* refs/pull/42371/head:
	mgr/volumes: Fix a race during clone cancel
	mgr/volumes: Fail subvolume removal if it's in progress

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

ea0408778625106cd5e1346d1769aae09133fef3