From patchwork Thu May 19 02:57:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7F7E3B6F6E for ; Thu, 19 May 2011 13:00:57 +1000 (EST) Received: from localhost ([::1]:48258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtTp-0002LS-H6 for incoming@patchwork.ozlabs.org; Wed, 18 May 2011 23:00:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQw-0005wQ-1D for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMtQv-0004zR-9v for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:53 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:38712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQv-0004zH-4g for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:53 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4J2eiSw029579 for ; Wed, 18 May 2011 20:40:44 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4J2x6ul105170 for ; Wed, 18 May 2011 20:59:06 -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 p4IKvK4F016405 for ; Wed, 18 May 2011 14:57:21 -0600 Received: from oc6675851006.ibm.com (sig-9-65-27-236.mts.ibm.com [9.65.27.236]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4IKuo4j014807; Wed, 18 May 2011 14:57:19 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 19:57:14 -0700 Message-Id: <1305773834-16359-25-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305773834-16359-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305773834-16359-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.153 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [V3 24/24] [virtio-9p] coroutine and threading for remove/unlink X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Venkateswararao Jujjuri " --- 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 293e377..70d1273 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -140,3 +140,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 7327b3b..a5f0590 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -212,11 +212,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); @@ -2595,10 +2590,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; }