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

Merge PR #25222 into master

* refs/pull/25222/head:
	mds: do not call Journaler::_trim twice

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

567f83c2cc4c7c47218bfa867600debfbd4f5d97