From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTJk-0006kf-Bz for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTJj-0002Ri-94 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:08:44 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:36846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTJi-0002Ae-Ls for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:08:43 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78H7dij025973 for ; Tue, 9 Aug 2011 03:07:39 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H6fvQ1265718 for ; Tue, 9 Aug 2011 03:06:41 +1000 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p78H7cHt027174 for ; Tue, 9 Aug 2011 03:07:38 +1000 From: "Aneesh Kumar K.V" Date: Mon, 8 Aug 2011 22:36:48 +0530 Message-Id: <1312823215-28675-22-git-send-email-aneesh.kumar@linux.vnet.ibm.com> In-Reply-To: <1312823215-28675-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1312823215-28675-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH -V4 21/28] [virtio-9p] coroutine and threading for v9fs_do_link 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/cofile.c | 14 ++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 19 ++++++------------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c index 26dd636..52eec2a 100644 --- a/hw/9pfs/cofile.c +++ b/hw/9pfs/cofile.c @@ -113,3 +113,17 @@ int v9fs_co_fsync(V9fsState *s, V9fsFidState *fidp, int datasync) }); return err; } + +int v9fs_co_link(V9fsState *s, V9fsString *oldpath, V9fsString *newpath) +{ + int err; + + v9fs_co_run_in_worker( + { + err = s->ops->link(&s->ctx, oldpath->data, newpath->data); + if (err < 0) { + err = -errno; + } + }); + return err; +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index e394933..17ffd76 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -88,4 +88,5 @@ extern int v9fs_co_close(V9fsState *, V9fsFidState *); extern int v9fs_co_fsync(V9fsState *, V9fsFidState *, int); extern int v9fs_co_symlink(V9fsState *, V9fsFidState *, const char *, const char *, gid_t); +extern int v9fs_co_link(V9fsState *, V9fsString *, V9fsString *); #endif diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 1760cdb..2985770 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -117,11 +117,6 @@ static int v9fs_do_chmod(V9fsState *s, V9fsString *path, mode_t mode) return s->ops->chmod(&s->ctx, path->data, &cred); } -static int v9fs_do_link(V9fsState *s, V9fsString *oldpath, V9fsString *newpath) -{ - return s->ops->link(&s->ctx, oldpath->data, newpath->data); -} - static int v9fs_do_truncate(V9fsState *s, V9fsString *path, off_t size) { return s->ops->truncate(&s->ctx, path->data, size); @@ -2032,9 +2027,8 @@ static void v9fs_create(void *opaque) err = -EINVAL; goto out; } - err = v9fs_do_link(pdu->s, &nfidp->path, &fullname); + err = v9fs_co_link(pdu->s, &nfidp->path, &fullname); if (err < 0) { - err = -errno; goto out; } } else if (perm & P9_STAT_MODE_DEVICE) { @@ -2174,21 +2168,20 @@ static void v9fs_link(void *opaque) dfidp = lookup_fid(s, dfid); if (dfidp == NULL) { - err = -errno; + err = -ENOENT; goto out; } oldfidp = lookup_fid(s, oldfid); if (oldfidp == NULL) { - err = -errno; + err = -ENOENT; goto out; } v9fs_string_sprintf(&fullname, "%s/%s", dfidp->path.data, name.data); - err = offset; - err = v9fs_do_link(s, &oldfidp->path, &fullname); - if (err) { - err = -errno; + err = v9fs_co_link(s, &oldfidp->path, &fullname); + if (!err) { + err = offset; } v9fs_string_free(&fullname); -- 1.7.4.1