david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9pfs: add xattrwalk_fid field in V9fsXattr struct

Browse Source 
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>
This commit is contained in:
Li Qiang 2016-11-01 12:00:40 +01:00 committed by Greg Kurz
parent 02ba9265e8
commit dd28fbbc2e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/9pfs/9p.c
View File

@ -325,7 +325,7 @@ static int coroutine_fn v9fs_xattr_fid_clunk(V9fsPDU *pdu, V9fsFidState *fidp)
{ {
int retval = 0; int retval = 0;
if (fidp->fs.xattr.copied_len == -1) { if (fidp->fs.xattr.xattrwalk_fid) {
/* getxattr/listxattr fid */ /* getxattr/listxattr fid */
goto free_value; goto free_value;
} }
@ -3190,7 +3190,7 @@ static void coroutine_fn v9fs_xattrwalk(void *opaque)
*/ */
xattr_fidp->fs.xattr.len = size; xattr_fidp->fs.xattr.len = size;
xattr_fidp->fid_type = P9_FID_XATTR; xattr_fidp->fid_type = P9_FID_XATTR;
xattr_fidp->fs.xattr.copied_len = -1; xattr_fidp->fs.xattr.xattrwalk_fid = true;
if (size) { if (size) {
xattr_fidp->fs.xattr.value = g_malloc(size); xattr_fidp->fs.xattr.value = g_malloc(size);
err = v9fs_co_llistxattr(pdu, &xattr_fidp->path, 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->fs.xattr.len = size;
xattr_fidp->fid_type = P9_FID_XATTR; xattr_fidp->fid_type = P9_FID_XATTR;
xattr_fidp->fs.xattr.copied_len = -1; xattr_fidp->fs.xattr.xattrwalk_fid = true;
if (size) { if (size) {
xattr_fidp->fs.xattr.value = g_malloc(size); xattr_fidp->fs.xattr.value = g_malloc(size);
err = v9fs_co_lgetxattr(pdu, &xattr_fidp->path, 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 = file_fidp;
xattr_fidp->fid_type = P9_FID_XATTR; xattr_fidp->fid_type = P9_FID_XATTR;
xattr_fidp->fs.xattr.copied_len = 0; xattr_fidp->fs.xattr.copied_len = 0;
xattr_fidp->fs.xattr.xattrwalk_fid = false;
xattr_fidp->fs.xattr.len = size; xattr_fidp->fs.xattr.len = size;
xattr_fidp->fs.xattr.flags = flags; xattr_fidp->fs.xattr.flags = flags;
v9fs_string_init(&xattr_fidp->fs.xattr.name); v9fs_string_init(&xattr_fidp->fs.xattr.name);

1
hw/9pfs/9p.h
View File

@ -164,6 +164,7 @@ typedef struct V9fsXattr
void *value; void *value;
V9fsString name; V9fsString name;
int flags; int flags;
bool xattrwalk_fid;
} V9fsXattr; } V9fsXattr;
typedef struct V9fsDir { typedef struct V9fsDir {