yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 717373379510cd6ecf8c6d0e1aae65edfac4551d Mon Sep 17 00:00:00 2001
902636
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
902636
Date: Tue, 5 May 2020 16:35:58 +0100
902636
Subject: [PATCH 7/9] virtiofsd: Show submounts
902636
902636
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Message-id: <20200505163600.22956-6-dgilbert@redhat.com>
902636
Patchwork-id: 96273
902636
O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 5/7] virtiofsd: Show submounts
902636
Bugzilla: 1817445
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
902636
902636
From: Max Reitz <mreitz@redhat.com>
902636
902636
Currently, setup_mounts() bind-mounts the shared directory without
902636
MS_REC.  This makes all submounts disappear.
902636
902636
Pass MS_REC so that the guest can see submounts again.
902636
902636
Fixes: 5baa3b8e95064c2434bd9e2f312edd5e9ae275dc
902636
Signed-off-by: Max Reitz <mreitz@redhat.com>
902636
Message-Id: <20200424133516.73077-1-mreitz@redhat.com>
902636
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
  Changed Fixes to point to the commit with the problem rather than
902636
          the commit that turned it on
902636
(cherry picked from commit ace0829c0d08f0e5f1451e402e94495bc2166772)
902636
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 tools/virtiofsd/passthrough_ll.c | 2 +-
902636
 1 file changed, 1 insertion(+), 1 deletion(-)
902636
902636
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
902636
index 73d8405..614ba55 100644
902636
--- a/tools/virtiofsd/passthrough_ll.c
902636
+++ b/tools/virtiofsd/passthrough_ll.c
902636
@@ -2670,7 +2670,7 @@ static void setup_mounts(const char *source)
902636
     int oldroot;
902636
     int newroot;
902636
 
902636
-    if (mount(source, source, NULL, MS_BIND, NULL) < 0) {
902636
+    if (mount(source, source, NULL, MS_BIND | MS_REC, NULL) < 0) {
902636
         fuse_log(FUSE_LOG_ERR, "mount(%s, %s, MS_BIND): %m\n", source, source);
902636
         exit(1);
902636
     }
902636
-- 
902636
1.8.3.1
902636