From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:43679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGQ-000824-0u for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTGO-0001pN-2A for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:17 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:45692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGN-0001p5-I0 for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:16 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp03.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78GxvUQ001350 for ; Tue, 9 Aug 2011 02:59:57 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H4Gt31048594 for ; Tue, 9 Aug 2011 03:04:16 +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 p78H5DRS030267 for ; Tue, 9 Aug 2011 03:05:14 +1000 From: "Aneesh Kumar K.V" Date: Mon, 8 Aug 2011 22:34:13 +0530 Message-Id: <1312823054-28331-26-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 25/26] [virtio-9p] coroutine and threading for remove/unlink 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/cofs.c | 14 ++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 11 ++--------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 6fcedd8..8fbfe73 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -141,3 +141,17 @@ int v9fs_co_mknod(V9fsState *s, V9fsString *path, uid_t uid, }); return err; } + +int v9fs_co_remove(V9fsState *s, V9fsString *path) +{ + int err; + + v9fs_co_run_in_worker( + { + err = s->ops->remove(&s->ctx, path->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 96e88d8..60795c4 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -74,4 +74,5 @@ extern int v9fs_co_lgetxattr(V9fsState *, V9fsString *, 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); +extern int v9fs_co_remove(V9fsState *, V9fsString *); #endif diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index f572053..86d4dec 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -211,11 +211,6 @@ static int v9fs_do_utimensat(V9fsState *s, V9fsString *path, return s->ops->utimensat(&s->ctx, path->data, times); } -static int v9fs_do_remove(V9fsState *s, V9fsString *path) -{ - return s->ops->remove(&s->ctx, path->data); -} - static int v9fs_do_fsync(V9fsState *s, int fd, int datasync) { return s->ops->fsync(&s->ctx, fd, datasync); @@ -2594,10 +2589,8 @@ static void v9fs_remove(void *opaque) err = -EINVAL; goto out; } - err = v9fs_do_remove(pdu->s, &fidp->path); - if (err < 0) { - err = -errno; - } else { + err = v9fs_co_remove(pdu->s, &fidp->path); + if (!err) { err = offset; } -- 1.7.4.1