From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 11 May 2018 22:05:46 +0000 (-0700)
Subject: Merge PR #21952 into mimic
X-Git-Tag: v13.1.1~33
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f6e2e7ba0c16e4c680b75522df51eff43ea972b0;p=ceph.git

Merge PR #21952 into mimic

* refs/pull/21952/head:
	mds: tighten conditions of calling rejoin_gather_finish()
	mds: avoid calling rejoin_gather_finish() two times successively
---

f6e2e7ba0c16e4c680b75522df51eff43ea972b0