From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 19 Sep 2016 17:02:45 +0000 (-0400)
Subject: client: always provide the file type in stx_mode
X-Git-Tag: v11.0.1~167^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F11093%2Fhead;p=ceph.git

client: always provide the file type in stx_mode

The proposed statx interface does this, and this would allow ganesha
to get away without requesting CEPH_STATX_MODE when all it wants is
enough to instantiate a filehandle.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/client/Client.cc b/src/client/Client.cc
index f431b60d9a51..6a31bd173029 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -6852,6 +6852,7 @@ void Client::fill_statx(Inode *in, unsigned int mask, struct ceph_statx *stx)
   /* These are always considered to be available */
   stx->stx_dev = in->snapid;
   stx->stx_blksize = MAX(in->layout.stripe_unit, 4096);
+  stx->stx_mode = S_IFMT & in->mode;
 
   if (use_faked_inos())
    stx->stx_ino = in->faked_ino;