From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 12 Dec 2018 20:47:16 +0000 (-0800)
Subject: Merge PR #25229 into master
X-Git-Tag: v14.1.0~635
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ad8b42d35640361fa4a37a3e496c001e9e71936c;p=ceph.git

Merge PR #25229 into master

* refs/pull/25229/head:
	mds: fix incorrect l_pq_executing_ops statistics when meet an invalid item in purge queue

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

ad8b42d35640361fa4a37a3e496c001e9e71936c