]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #19271 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Dec 2017 19:08:11 +0000 (11:08 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 15 Dec 2017 19:08:11 +0000 (11:08 -0800)
commit199f9d4c6bd76adde81902a574120e3f3c9b98a1
treefeaf9896848681e9a6b7b731a08cfe9a63382a0e
parent0f48b3d29ec40c2e7acd3b3a29a996a523b35c70
parentfd041a1920accc0e7f2f2bc152c7fd1a0a3d8dfc
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>
src/client/Client.h