From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 18 Feb 2018 18:36:34 +0000 (-0800)
Subject: Merge PR #20168 into master
X-Git-Tag: v13.0.2~236
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=039165276e20ab24e2bf0e03fd43025bd3463889;p=ceph.git

Merge PR #20168 into master

* 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>
---

039165276e20ab24e2bf0e03fd43025bd3463889