diff options
| author | Li Qiang <liqiang6-s@360.cn> | 2016-11-01 12:00:40 +0100 |
|---|---|---|
| committer | Greg Kurz <groug@kaod.org> | 2016-11-01 12:00:40 +0100 |
| commit | dd28fbbc2edc0822965d402d927ce646326d6954 (patch) | |
| tree | d6a2304207c069681540e4521aef42a4a170368a /hw | |
| parent | 02ba9265e8d65f24d0cdca158d96e0b0451f6b71 (diff) | |
| download | qemu-dd28fbbc2edc0822965d402d927ce646326d6954.tar.gz qemu-dd28fbbc2edc0822965d402d927ce646326d6954.tar.bz2 qemu-dd28fbbc2edc0822965d402d927ce646326d6954.zip | |
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: Greg Kurz <groug@kaod.org>
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/9pfs/9p.c | 7 | ||||
| -rw-r--r-- | hw/9pfs/9p.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index e88cf257a2..ab18ef2adf 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -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); diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index 2523a445f8..48065cc221 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -164,6 +164,7 @@ typedef struct V9fsXattr void *value; V9fsString name; int flags; + bool xattrwalk_fid; } V9fsXattr; typedef struct V9fsDir { |