From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 24 Sep 2018 22:01:52 +0000 (-0700)
Subject: Merge PR #24194 into master
X-Git-Tag: v14.0.1~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08166e8d5a6a35d1c8bb250acaaf99044ad94173;p=ceph.git

Merge PR #24194 into master

* refs/pull/24194/head:
	mds: fix mds damaged due to unexpected journal length

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

08166e8d5a6a35d1c8bb250acaaf99044ad94173