From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 18 May 2020 22:10:56 +0000 (-0700)
Subject: Merge PR #34144 into master
X-Git-Tag: v16.1.0~2304
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0fbf2a723a8edbf35e579865e88ff6a738e3e828;p=ceph.git

Merge PR #34144 into master

* refs/pull/34144/head:
	Filer: Add error handler in _do_purge_range()
	mds: Handle blacklisted error in purge queue

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

0fbf2a723a8edbf35e579865e88ff6a738e3e828