[RFC PATCH 4/4] ceph: fill in the change attribute in statx requests
Xiubo Li
xiubli at redhat.com
Mon Aug 8 04:56:43 PDT 2022
On 8/6/22 2:35 AM, Jeff Layton wrote:
> When statx requests the change attribute, request the full gamut of caps
> (similarly to how ctime is handled). When the change attribute seems to
> be valid, return it in the chgattr field.
>
> Signed-off-by: Jeff Layton <jlayton at kernel.org>
> ---
> fs/ceph/inode.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
> index 56c53ab3618e..fb2ed85f9083 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -2408,10 +2408,10 @@ static int statx_to_caps(u32 want, umode_t mode)
> {
> int mask = 0;
>
> - if (want & (STATX_MODE|STATX_UID|STATX_GID|STATX_CTIME|STATX_BTIME))
> + if (want & (STATX_MODE|STATX_UID|STATX_GID|STATX_CTIME|STATX_BTIME|STATX_CHGATTR))
> mask |= CEPH_CAP_AUTH_SHARED;
>
> - if (want & (STATX_NLINK|STATX_CTIME)) {
> + if (want & (STATX_NLINK|STATX_CTIME|STATX_CHGATTR)) {
> /*
> * The link count for directories depends on inode->i_subdirs,
> * and that is only updated when Fs caps are held.
> @@ -2422,11 +2422,10 @@ static int statx_to_caps(u32 want, umode_t mode)
> mask |= CEPH_CAP_LINK_SHARED;
> }
>
> - if (want & (STATX_ATIME|STATX_MTIME|STATX_CTIME|STATX_SIZE|
> - STATX_BLOCKS))
> + if (want & (STATX_ATIME|STATX_MTIME|STATX_CTIME|STATX_SIZE| STATX_BLOCKS|STATX_CHGATTR))
> mask |= CEPH_CAP_FILE_SHARED;
>
> - if (want & (STATX_CTIME))
> + if (want & (STATX_CTIME|STATX_CHGATTR))
> mask |= CEPH_CAP_XATTR_SHARED;
>
> return mask;
> @@ -2468,6 +2467,11 @@ int ceph_getattr(struct user_namespace *mnt_userns, const struct path *path,
> valid_mask |= STATX_BTIME;
> }
>
> + if (request_mask & STATX_CHGATTR) {
> + stat->chgattr = inode_peek_iversion_raw(inode);
> + valid_mask |= STATX_CHGATTR;
> + }
> +
> if (ceph_snap(inode) == CEPH_NOSNAP)
> stat->dev = inode->i_sb->s_dev;
> else
Reviewed-by: Xiubo Li <xiubli at redhat.com>
More information about the linux-afs
mailing list