Quoting Qiang Huang (h.huangqi...@huawei.com):
> It's a duplicate of util.h.
>
> Signed-off-by: Qiang Huang <h.huangqi...@huawei.com>
Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
Yup, thanks. Stéphane had already mentioned it. I had put the
setns bit in there while trying to figure out why SYS_setns
was coming up undefined, and failed to remove it when this did
not fix it...
> ---
> src/lxc/lxc_user_nic.c | 20 --------------------
> 1 file changed, 20 deletions(-)
>
> diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/lxc_user_nic.c
> index dc35e55..e4f59fa 100644
> --- a/src/lxc/lxc_user_nic.c
> +++ b/src/lxc/lxc_user_nic.c
> @@ -49,25 +49,6 @@
> #include "config.h"
> #include "utils.h"
>
> -#ifndef HAVE_GETLINE
> -#ifdef HAVE_FGETLN
> -#include <../include/getline.h>
> -#endif
> -#endif
> -
> -/* Define setns() if missing from the C library */
> -#ifndef HAVE_SETNS
> -static inline int setns(int fd, int nstype)
> -{
> -#ifdef __NR_setns
> - return syscall(__NR_setns, fd, nstype);
> -#else
> - errno = ENOSYS;
> - return -1;
> -#endif
> -}
> -#endif
> -
> #if ISTEST
> #define CONF_FILE "/tmp/lxc-usernet"
> #define DB_FILE "/tmp/nics"
> @@ -76,7 +57,6 @@ static inline int setns(int fd, int nstype)
> #define DB_FILE LXC_USERNIC_DB
> #endif
>
> -
> #include "nl.h"
>
> #ifndef IFLA_LINKMODE
> --
> 1.8.3
>
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
