Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com> --- hw/9pfs/codir.c | 19 +++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 28 ++++++---------------------- 3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index 885f7d0..4ccf94f 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -66,3 +66,22 @@ void v9fs_co_rewinddir(V9fsState *s, V9fsFidState *fidp) }); return; } + +int v9fs_co_mkdir(V9fsState *s, char *name, mode_t mode, uid_t uid, gid_t gid) +{ + int err; + FsCred cred; + + cred_init(&cred); + cred.fc_mode = mode; + cred.fc_uid = uid; + cred.fc_gid = gid; + v9fs_co_run_in_worker( + { + err = s->ops->mkdir(&s->ctx, name, &cred); + if (err < 0) { + err = -errno; + } + }); + return err; +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index d023683..96e88d8 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -73,4 +73,5 @@ extern int v9fs_co_lgetxattr(V9fsState *, V9fsString *, V9fsString *, void *, size_t); extern int v9fs_co_mknod(V9fsState *, V9fsString *, uid_t, gid_t, dev_t, mode_t); +extern int v9fs_co_mkdir(V9fsState *, char *, mode_t, uid_t, gid_t); #endif diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 3f4d449..89fe652 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -149,19 +149,6 @@ static int v9fs_do_mknod(V9fsState *s, char *name, return s->ops->mknod(&s->ctx, name, &cred); } -static int v9fs_do_mkdir(V9fsState *s, char *name, mode_t mode, - uid_t uid, gid_t gid) -{ - FsCred cred; - - cred_init(&cred); - cred.fc_uid = uid; - cred.fc_gid = gid; - cred.fc_mode = mode; - - return s->ops->mkdir(&s->ctx, name, &cred); -} - static int v9fs_do_fstat(V9fsState *s, int fd, struct stat *stbuf) { return s->ops->fstat(&s->ctx, fd, stbuf); @@ -2327,8 +2314,7 @@ out: static void v9fs_create_post_mkdir(V9fsState *s, V9fsCreateState *vs, int err) { - if (err) { - err = -errno; + if (err < 0) { goto out; } @@ -2377,7 +2363,7 @@ static void v9fs_create_post_lstat(V9fsState *s, V9fsCreateState *vs, int err) } if (vs->perm & P9_STAT_MODE_DIR) { - err = v9fs_do_mkdir(s, vs->fullname.data, vs->perm & 0777, + err = v9fs_co_mkdir(s, vs->fullname.data, vs->perm & 0777, vs->fidp->uid, -1); v9fs_create_post_mkdir(s, vs, err); } else if (vs->perm & P9_STAT_MODE_SYMLINK) { @@ -3177,14 +3163,12 @@ static void v9fs_mkdir(void *opaque) goto out; } v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, name.data); - err = v9fs_do_mkdir(pdu->s, fullname.data, mode, fidp->uid, gid); - if (err == -1) { - err = -errno; + err = v9fs_co_mkdir(pdu->s, fullname.data, mode, fidp->uid, gid); + if (err < 0) { goto out; } - err = v9fs_do_lstat(pdu->s, &fullname, &stbuf); - if (err == -1) { - err = -errno; + err = v9fs_co_lstat(pdu->s, &fullname, &stbuf); + if (err < 0) { goto out; } stat_to_qid(&stbuf, &qid); -- 1.7.1