From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Oct 2018 21:16:39 +0000 (-0500)
Subject: Merge PR #24296 into master
X-Git-Tag: v14.0.1~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b624cea60a2f50085f3b24225d9949481aacf48b;p=ceph.git

Merge PR #24296 into master

* refs/pull/24296/head:
	osd: Handle is_stopping() by discarding item so it doesn't loop
	osd: Simplify _process() logic recently added

Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

b624cea60a2f50085f3b24225d9949481aacf48b