From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxo-0001Cm-SU for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKcxn-0001zK-HE for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:28 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:42864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxn-0001yx-9p for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:27 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4CKpJOV015011 for ; Thu, 12 May 2011 14:51:19 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4CKwMIV144034 for ; Thu, 12 May 2011 14:58:22 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4CEvs6n001083 for ; Thu, 12 May 2011 08:57:54 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Thu, 12 May 2011 13:57:44 -0700 Message-Id: <1305233867-4367-23-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 22/25] [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)" , stefanha@linux.vnet.ibm.com Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/codir.c | 34 ++++++++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 28 ++++++---------------------- 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/hw/9pfs/codir.c b/hw/9pfs/codir.c index adca50c..fcd204d 100644 --- a/hw/9pfs/codir.c +++ b/hw/9pfs/codir.c @@ -133,3 +133,37 @@ void v9fs_co_rewinddir(V9fsState *s, V9fsFidState *fidp) qemu_coroutine_yield(); return; } + +typedef struct V9fsThMkDirState { + V9fsState *s; + FsCred cred; + char *name; + int err; + V9fsRequest request; +} V9fsThMkDirState; + +static void v9fs_th_do_mkdir(V9fsRequest *request) +{ + V9fsThMkDirState *vsp = container_of(request, V9fsThMkDirState, request); + + vsp->err = vsp->s->ops->mkdir(&vsp->s->ctx, vsp->name, &vsp->cred); + if (vsp->err < 0) { + vsp->err = -errno; + } +} + +int v9fs_co_mkdir(V9fsState *s, char *name, mode_t mode, uid_t uid, gid_t gid) +{ + V9fsThMkDirState vs; + vs.s = s; + vs.name = name; + cred_init(&vs.cred); + vs.cred.fc_mode = mode; + vs.cred.fc_uid = uid; + vs.cred.fc_gid = gid; + vs.request.func = v9fs_th_do_mkdir; + vs.request.coroutine = qemu_coroutine_self(); + v9fs_qemu_submit_request(&vs.request); + qemu_coroutine_yield(); + return vs.err; +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index bd410cb..3edab4e 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -66,4 +66,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 4858f37..e5112fe 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); @@ -2354,8 +2341,7 @@ out: static void v9fs_create_post_mkdir(V9fsState *s, V9fsCreateState *vs, int err) { - if (err) { - err = -errno; + if (err < 0) { goto out; } @@ -2404,7 +2390,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) { @@ -3225,14 +3211,12 @@ static void v9fs_mkdir(void *opaque) goto out; } v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, name.data); - err = v9fs_do_mkdir(copdu->s, fullname.data, mode, fidp->uid, gid); - if (err == -1) { - err = -errno; + err = v9fs_co_mkdir(copdu->s, fullname.data, mode, fidp->uid, gid); + if (err < 0) { goto out; } - err = v9fs_do_lstat(copdu->s, &fullname, &stbuf); - if (err == -1) { - err = -errno; + err = v9fs_co_lstat(copdu->s, &fullname, &stbuf); + if (err < 0) { goto out; } stat_to_qid(&stbuf, &qid); -- 1.7.1