From 38d9db6068898f5fa521846a6196f6a1f5f6ba5e Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Fri, 20 Nov 2020 18:43:31 -0500 Subject: [PATCH] client: when STATX_NLINK is requested request FsLs caps We currently determine the getattr request mask prior to doing the lookup, so we don't necessarily know whether the terminal entry is a directory or something else. Directory nlink count is governed by the dirstats, and those are under Fs caps. Request both Fs and Ls if the request mask includes STATX_NLINK. Fixes: https://tracker.ceph.com/issues/48313 Signed-off-by: Jeff Layton (cherry picked from commit e2ea2214cbb1ff4bd7332bb28db4f3477efb37df) --- src/client/Client.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 9e87d63d46061..1020dd7ee0430 100755 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -7289,7 +7289,7 @@ unsigned Client::statx_to_mask(unsigned int flags, unsigned int want) mask |= CEPH_CAP_AUTH_SHARED; if (want & (CEPH_STATX_NLINK|CEPH_STATX_CTIME|CEPH_STATX_VERSION)) mask |= CEPH_CAP_LINK_SHARED; - if (want & (CEPH_STATX_ATIME|CEPH_STATX_MTIME|CEPH_STATX_CTIME|CEPH_STATX_SIZE|CEPH_STATX_BLOCKS|CEPH_STATX_VERSION)) + if (want & (CEPH_STATX_NLINK|CEPH_STATX_ATIME|CEPH_STATX_MTIME|CEPH_STATX_CTIME|CEPH_STATX_SIZE|CEPH_STATX_BLOCKS|CEPH_STATX_VERSION)) mask |= CEPH_CAP_FILE_SHARED; if (want & (CEPH_STATX_VERSION|CEPH_STATX_CTIME)) mask |= CEPH_CAP_XATTR_SHARED; -- 2.39.5