Commit dd28fbbc authored by Li Qiang's avatar Li Qiang Committed by Greg Kurz
Browse files

9pfs: add xattrwalk_fid field in V9fsXattr struct 



Currently, 9pfs sets the 'copied_len' field in V9fsXattr
to -1 to tag xattr walk fid. As the 'copied_len' is also
used to account for copied bytes, this may make confusion. This patch
add a bool 'xattrwalk_fid' to tag the xattr walk fid.

Suggested-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarLi Qiang <liqiang6-s@360.cn>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
parent 02ba9265

hw/9pfs/9p.c

+4 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int coroutine_fn v9fs_xattr_fid_clunk(V9fsPDU *pdu, V9fsFidState *fidp) 
{

    int retval = 0;



    if (fidp->fs.xattr.copied_len == -1) {

    if (fidp->fs.xattr.xattrwalk_fid) {

        /* getxattr/listxattr fid */

        goto free_value;

    }
@@ -3190,7 +3190,7 @@ static void coroutine_fn v9fs_xattrwalk(void *opaque) 
         */

        xattr_fidp->fs.xattr.len = size;

        xattr_fidp->fid_type = P9_FID_XATTR;

        xattr_fidp->fs.xattr.copied_len = -1;

        xattr_fidp->fs.xattr.xattrwalk_fid = true;

        if (size) {

            xattr_fidp->fs.xattr.value = g_malloc(size);

            err = v9fs_co_llistxattr(pdu, &xattr_fidp->path,
@@ -3223,7 +3223,7 @@ static void coroutine_fn v9fs_xattrwalk(void *opaque) 
         */

        xattr_fidp->fs.xattr.len = size;

        xattr_fidp->fid_type = P9_FID_XATTR;

        xattr_fidp->fs.xattr.copied_len = -1;

        xattr_fidp->fs.xattr.xattrwalk_fid = true;

        if (size) {

            xattr_fidp->fs.xattr.value = g_malloc(size);

            err = v9fs_co_lgetxattr(pdu, &xattr_fidp->path,
@@ -3279,6 +3279,7 @@ static void coroutine_fn v9fs_xattrcreate(void *opaque) 
    xattr_fidp = file_fidp;

    xattr_fidp->fid_type = P9_FID_XATTR;

    xattr_fidp->fs.xattr.copied_len = 0;

    xattr_fidp->fs.xattr.xattrwalk_fid = false;

    xattr_fidp->fs.xattr.len = size;

    xattr_fidp->fs.xattr.flags = flags;

    v9fs_string_init(&xattr_fidp->fs.xattr.name);

hw/9pfs/9p.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ typedef struct V9fsXattr 
    void *value;

    V9fsString name;

    int flags;

    bool xattrwalk_fid;

} V9fsXattr;



typedef struct V9fsDir {