lkml.org 
[lkml]   [2022]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 5/9] ceph: report the inode version in getattr if requested
    Date
    When getattr requests the STX_VERSION, request the full gamut of caps
    (similarly to how ctime is handled). When the change attribute seems to
    be valid, return it in the ino_version field and set the flag in the
    reply mask. Also, unconditionally enable STATX_ATTR_VERSION_MONOTONIC.

    Reviewed-by: Xiubo Li <xiubli@redhat.com>
    Signed-off-by: Jeff Layton <jlayton@kernel.org>
    ---
    fs/ceph/inode.c | 16 +++++++++++-----
    1 file changed, 11 insertions(+), 5 deletions(-)

    diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
    index 42351d7a0dd6..bcab855bf1ae 100644
    --- a/fs/ceph/inode.c
    +++ b/fs/ceph/inode.c
    @@ -2415,10 +2415,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_VERSION))
    mask |= CEPH_CAP_AUTH_SHARED;

    - if (want & (STATX_NLINK|STATX_CTIME)) {
    + if (want & (STATX_NLINK|STATX_CTIME|STATX_VERSION)) {
    /*
    * The link count for directories depends on inode->i_subdirs,
    * and that is only updated when Fs caps are held.
    @@ -2429,11 +2429,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_VERSION))
    mask |= CEPH_CAP_FILE_SHARED;

    - if (want & (STATX_CTIME))
    + if (want & (STATX_CTIME|STATX_VERSION))
    mask |= CEPH_CAP_XATTR_SHARED;

    return mask;
    @@ -2475,6 +2474,11 @@ int ceph_getattr(struct user_namespace *mnt_userns, const struct path *path,
    valid_mask |= STATX_BTIME;
    }

    + if (request_mask & STATX_VERSION) {
    + stat->version = inode_peek_iversion_raw(inode);
    + valid_mask |= STATX_VERSION;
    + }
    +
    if (ceph_snap(inode) == CEPH_NOSNAP)
    stat->dev = inode->i_sb->s_dev;
    else
    @@ -2498,6 +2502,8 @@ int ceph_getattr(struct user_namespace *mnt_userns, const struct path *path,
    stat->nlink = 1 + 1 + ci->i_subdirs;
    }

    + stat->attributes_mask |= STATX_ATTR_VERSION_MONOTONIC;
    + stat->attributes |= STATX_ATTR_VERSION_MONOTONIC;
    stat->result_mask = request_mask & valid_mask;
    return err;
    }
    --
    2.37.3
    \
     
     \ /
      Last update: 2022-10-17 12:59    [W:2.571 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site