From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 15 Dec 2017 19:08:11 +0000 (-0800)
Subject: Merge PR #19271 into master
X-Git-Tag: wip-pdonnell-testing-20180317.202121~810
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=199f9d4c6bd76adde81902a574120e3f3c9b98a1;p=ceph-ci.git

Merge PR #19271 into master

* refs/pull/19271/head:
	client: update Dir::num_null_dentries in Dentry::{link,unlink}
	client: drop null child dentries before try pruning inode's alias

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

199f9d4c6bd76adde81902a574120e3f3c9b98a1