From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 7 May 2018 22:43:34 +0000 (-0700)
Subject: Merge PR #21668 into master
X-Git-Tag: v14.0.0~194
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54d514a52211b2c1d97ca21943cf2c6a81b58208;p=ceph.git

Merge PR #21668 into master

* refs/pull/21668/head:
	mds: include nfiles/nsubdirs of directory inode in MClientCaps

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

54d514a52211b2c1d97ca21943cf2c6a81b58208