From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGL-0007lC-8I for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTGI-0001o6-CF for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:13 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:43673) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGH-0001nR-Of for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:10 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78GxxRh014734 for ; Tue, 9 Aug 2011 02:59:59 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H4DYu1507572 for ; Tue, 9 Aug 2011 03:04:13 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p78H57p6030138 for ; Tue, 9 Aug 2011 03:05:08 +1000 From: "Aneesh Kumar K.V" Date: Mon, 8 Aug 2011 22:34:10 +0530 Message-Id: <1312823054-28331-23-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V4 22/26] [virtio-9p] coroutine and threading for mkdir List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri (JV)" , "Aneesh Kumar K.V" From: Venkateswararao Jujjuri (JV) Signed-off-by: Venkateswararao Jujjuri " Signed-off-by: Aneesh Kumar K.V --- 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 47b10df..28f2ad7 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -64,3 +64,22 @@ void v9fs_co_rewinddir(V9fsState *s, V9fsFidState *fidp) s->ops->rewinddir(&s->ctx, fidp->fs.dir); }); } + +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 fbed376..37ba72c 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); @@ -2329,8 +2316,7 @@ out: static void v9fs_create_post_mkdir(V9fsState *s, V9fsCreateState *vs, int err) { - if (err) { - err = -errno; + if (err < 0) { goto out; } @@ -2379,7 +2365,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) { @@ -3179,14 +3165,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.4.1