---
 src/lxc/lxc_container.c | 5 +----
 src/lxc/lxc_container.h | 4 ++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 532fd0be0..3b8cb966e 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -113,9 +113,6 @@ struct __lxc_child_argv {
     int *nsInheritFDs;
 };
 
-static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
-                                    const char *srcprefix,
-                                    const char *sec_mount_options);
 
 
 /*
@@ -1499,7 +1496,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs,
 }
 
 
-static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
+int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
                                     const char *srcprefix,
                                     const char *sec_mount_options)
 {
diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h
index 641e2d460..3a3564b79 100644
--- a/src/lxc/lxc_container.h
+++ b/src/lxc/lxc_container.h
@@ -68,4 +68,8 @@ int lxcContainerChown(virDomainDefPtr def, const char *path);
 
 bool lxcIsBasicMountLocation(const char *path);
 
+int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
+                             const char *srcprefix,
+                             const char *sec_mount_options);
+
 #endif /* LXC_CONTAINER_H */
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On 04/15/2018 05:25 PM, Radostin Stoyanov wrote:
> ---
>  src/lxc/lxc_container.c | 5 +----
>  src/lxc/lxc_container.h | 4 ++++
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 

Hopefully mprivozn can take a look at this series as he knows most about
namespaces...  Not sure if he's just been too busy recently and missed
something referencing namespaces from your cover...

> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 532fd0be0..3b8cb966e 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -113,9 +113,6 @@ struct __lxc_child_argv {
>      int *nsInheritFDs;
>  };
>  
> -static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
> -                                    const char *srcprefix,
> -                                    const char *sec_mount_options);
>  
>  
>  /*
> @@ -1499,7 +1496,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs,
>  }
>  
>  
> -static int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
> +int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
>                                      const char *srcprefix,
>                                      const char *sec_mount_options)

while you're at it since more recent code uses a different syntax:

int
lxcContainerMountFSBlock(virDomainFSDefPtr fs,
                         const char *srcprefix,
                         const char *sec_mount_options)

NB: Alignment of 2nd/3rd args too..

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

>  {
> diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h
> index 641e2d460..3a3564b79 100644
> --- a/src/lxc/lxc_container.h
> +++ b/src/lxc/lxc_container.h
> @@ -68,4 +68,8 @@ int lxcContainerChown(virDomainDefPtr def, const char *path);
>  
>  bool lxcIsBasicMountLocation(const char *path);
>  
> +int lxcContainerMountFSBlock(virDomainFSDefPtr fs,
> +                             const char *srcprefix,
> +                             const char *sec_mount_options);
> +
>  #endif /* LXC_CONTAINER_H */
> 

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list