From patchwork Wed Mar 9 17:15:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohan Kumar M X-Patchwork-Id: 86143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9CB48B6EF1 for ; Thu, 10 Mar 2011 04:52:40 +1100 (EST) Received: from localhost ([127.0.0.1]:36661 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxNYr-0005pN-3r for incoming@patchwork.ozlabs.org; Wed, 09 Mar 2011 12:52:37 -0500 Received: from [140.186.70.92] (port=47817 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxN9L-0001nq-Pb for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:26:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxN10-0005gV-1y for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:39 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:58117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxN0z-0005fR-A7 for qemu-devel@nongnu.org; Wed, 09 Mar 2011 12:17:38 -0500 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by e28smtp03.in.ibm.com (8.14.4/8.13.1) with ESMTP id p29HHYJm000778 for ; Wed, 9 Mar 2011 22:47:34 +0530 Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p29HHSd12068660 for ; Wed, 9 Mar 2011 22:47:34 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p29HG79D020241 for ; Wed, 9 Mar 2011 22:46:08 +0530 Received: from explorer.in.ibm.com ([9.124.208.3]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p29HG4wD020116; Wed, 9 Mar 2011 22:46:07 +0530 From: "M. Mohan Kumar" To: qemu-devel@nongnu.org, Stefan Hajnoczi Date: Wed, 9 Mar 2011 22:45:57 +0530 Message-Id: <1299690960-12007-9-git-send-email-mohan@in.ibm.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1299690960-12007-1-git-send-email-mohan@in.ibm.com> References: <1299690960-12007-1-git-send-email-mohan@in.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 122.248.162.3 Cc: Subject: [Qemu-devel] [V8 PATCH 08/11] virtio-9p: Add support for removing file or directory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Support for removing file or directory in chroot environment. Add interfaces to remove file/directory in chroot worker and qemu side. Signed-off-by: M. Mohan Kumar --- hw/9pfs/virtio-9p-chroot-worker.c | 34 ++++++++++++++++++++++++++-------- hw/9pfs/virtio-9p-chroot.h | 1 + hw/9pfs/virtio-9p-local.c | 6 +++++- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/hw/9pfs/virtio-9p-chroot-worker.c b/hw/9pfs/virtio-9p-chroot-worker.c index fcc0be1..40e572c 100644 --- a/hw/9pfs/virtio-9p-chroot-worker.c +++ b/hw/9pfs/virtio-9p-chroot-worker.c @@ -161,6 +161,21 @@ unset_uid: return retval; } +/* + * Remove a file object + * Returns 0 on success and -errno on failure + */ +static int chroot_do_remove(V9fsFileObjectRequest *request) +{ + int retval; + + retval = remove(request->path.path); + if (retval < 0) { + return -errno; + } + return 0; +} + static void chroot_daemonize(int chroot_sock) { sigset_t sigset; @@ -199,7 +214,7 @@ int v9fs_chroot(FsContext *fs_ctx) V9fsFileObjectRequest request; pid_t pid; uint32_t code; - int fd, valid_fd; + int retval, valid_fd; if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd_pair) < 0) { error_report("socketpair %s", strerror(errno)); @@ -245,14 +260,14 @@ int v9fs_chroot(FsContext *fs_ctx) } switch (request.data.type) { case T_OPEN: - fd = chroot_do_open(&request); - if (fd >= 0) { + retval = chroot_do_open(&request); + if (retval >= 0) { valid_fd = 1; } break; case T_CREATE: - fd = chroot_do_create(&request); - if (fd >= 0) { + retval = chroot_do_create(&request); + if (retval >= 0) { valid_fd = 1; } break; @@ -260,12 +275,15 @@ int v9fs_chroot(FsContext *fs_ctx) case T_SYMLINK: case T_LINK: case T_MKNOD: - fd = chroot_do_create_special(&request); + retval = chroot_do_create_special(&request); + break; + case T_REMOVE: + retval = chroot_do_remove(&request); break; default: - fd = -1; + retval = -1; break; } - chroot_sendfd(chroot_sock, fd, valid_fd); + chroot_sendfd(chroot_sock, retval, valid_fd); } } diff --git a/hw/9pfs/virtio-9p-chroot.h b/hw/9pfs/virtio-9p-chroot.h index b2db276..2d7984a 100644 --- a/hw/9pfs/virtio-9p-chroot.h +++ b/hw/9pfs/virtio-9p-chroot.h @@ -8,6 +8,7 @@ #define T_MKNOD 4 #define T_SYMLINK 5 #define T_LINK 6 +#define T_REMOVE 7 union MsgControl { struct cmsghdr cmsg; diff --git a/hw/9pfs/virtio-9p-local.c b/hw/9pfs/virtio-9p-local.c index e7d39c0..cdbaf6a 100644 --- a/hw/9pfs/virtio-9p-local.c +++ b/hw/9pfs/virtio-9p-local.c @@ -559,7 +559,11 @@ static int local_utimensat(FsContext *s, const char *path, static int local_remove(FsContext *ctx, const char *path) { - return remove(rpath(ctx, path)); + if (ctx->fs_sm == SM_PASSTHROUGH) { + return passthrough_request(ctx, NULL, path, 0, NULL, T_REMOVE); + } else { + return remove(rpath(ctx, path)); + } } static int local_fsync(FsContext *ctx, int fd, int datasync)