From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 17 Dec 2019 00:01:19 +0000 (-0800)
Subject: Merge PR #31595 into master
X-Git-Tag: v15.1.0~475
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=333e9383271e476ab73b42abe715f98a520ef556;p=ceph.git

Merge PR #31595 into master

* refs/pull/31595/head:
	mds: optimize function, fragset_t::simplify, to improve the efficiency of  merging fragment

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

333e9383271e476ab73b42abe715f98a520ef556