Re: [PATCH] cgroup mount: ignore nsroot=

From	Tycho Andersen <tycho.andersen@canonical.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] cgroup mount: ignore nsroot=
Date	2016-03-30 20:10 +0200
Message-ID	<risJ5-Lt-17@gated-at.bofh.it> (permalink)
References	<rfhKa-4mP-27@gated-at.bofh.it> <ri2lB-72M-25@gated-at.bofh.it> <ri87G-2Ps-59@gated-at.bofh.it> <ris6m-fc-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Wed, Mar 30, 2016 at 12:21:00PM -0500, Serge E. Hallyn wrote:
> As of the patch "cgroup namespaces: add a 'nsroot=' mountinfo field", 
> cgroupfs mountinfo output shows 'nsroot='.  If userspace like criu
> copy/pastes mount options from there into a new mount command, we should
> ignore it.
> 
> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

Tested-by: Tycho Andersen <tycho.andersen@canonical.com>

Thanks, Serge.

> ---
>  kernel/cgroup.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/kernel/cgroup.c b/kernel/cgroup.c
> index ef0c25d..69fb112 100644
> --- a/kernel/cgroup.c
> +++ b/kernel/cgroup.c
> @@ -1680,6 +1680,10 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
>  			opts->none = true;
>  			continue;
>  		}
> +		if (!strncmp(token, "nsroot=", 7)) {
> +			/* ignore nsroot= copied from mountinfo */
> +			continue;
> +		}
>  		if (!strcmp(token, "all")) {
>  			/* Mutually exclusive option 'all' + subsystem name */
>  			if (one_ss)
> -- 
> 2.7.0
>

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[RFC PATCH] cgroup namespaces: add a 'nsroot=' mountinfo field "Serge E. Hallyn" <serge@hallyn.com> - 2016-03-22 00:50 +0100
  Re: [RFC PATCH] cgroup namespaces: add a 'nsroot=' mountinfo field "Serge E. Hallyn" <serge@hallyn.com> - 2016-03-29 03:20 +0200
    Re: [RFC PATCH] cgroup namespaces: add a 'nsroot=' mountinfo field Tejun Heo <tj@kernel.org> - 2016-03-30 21:00 +0200
  Re: [RFC PATCH] cgroup namespaces: add a 'nsroot=' mountinfo field Tycho Andersen <tycho.andersen@canonical.com> - 2016-03-29 16:00 +0200
    Re: [RFC PATCH] cgroup namespaces: add a 'nsroot=' mountinfo field "Serge E. Hallyn" <serge@hallyn.com> - 2016-03-29 22:10 +0200
      [PATCH] cgroup mount: ignore nsroot= "Serge E. Hallyn" <serge@hallyn.com> - 2016-03-30 19:30 +0200
        Re: [PATCH] cgroup mount: ignore nsroot= Tycho Andersen <tycho.andersen@canonical.com> - 2016-03-30 20:10 +0200

csiph-web