From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 19 May 2018 04:36:50 +0000 (-0700)
Subject: Merge PR #22073 into master
X-Git-Tag: v14.0.0~88
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eee7ed2688d2b70ad0d449f31eedd70a032957d0;p=ceph.git

Merge PR #22073 into master

* refs/pull/22073/head:
	client: delay dentry trimming until after cap traversal
	qa: test for trim_caps segfault for trimmed dentries

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

eee7ed2688d2b70ad0d449f31eedd70a032957d0