Patchwork [V8,08/11] virtio-9p: Add support for removing file or directory

login
register
mail settings
Submitter Mohan Kumar M
Date March 9, 2011, 5:15 p.m.
Message ID <1299690960-12007-9-git-send-email-mohan@in.ibm.com>
Download mbox | patch
Permalink /patch/86143/
State New
Headers show

Comments

Mohan Kumar M - March 9, 2011, 5:15 p.m.
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 <mohan@in.ibm.com>
---
 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(-)

Patch

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)