]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #20168 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 18 Feb 2018 18:36:34 +0000 (10:36 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 18 Feb 2018 18:36:34 +0000 (10:36 -0800)
* refs/pull/20168/head:
Handle dir->dentries.empty()
client: lookup_ino when i1 becomes NULL

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/client/Client.cc
src/client/fuse_ll.cc

Simple merge
Simple merge