cgroups.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
To: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	Cgroups <cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH 3/3] cgroup: set visible flag only after we've mounted the default root
Date: Tue, 3 Jun 2014 12:05:59 +0800	[thread overview]
Message-ID: <538D49A7.2010403@huawei.com> (raw)
In-Reply-To: <538D4956.5050205-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

This fixes the failure path, so we won't set the visible flag though
the mount is failed.

Signed-off-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 kernel/cgroup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index dabc486..0b6b44e 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1671,7 +1671,6 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
 
 	/* look for a matching existing root */
 	if (!opts.subsys_mask && !opts.none && !opts.name) {
-		cgrp_dfl_root_visible = true;
 		root = &cgrp_dfl_root;
 		cgroup_get(&root->cgrp);
 		ret = 0;
@@ -1770,6 +1769,9 @@ out_free:
 	dentry = kernfs_mount(fs_type, flags, root->kf_root, &new_sb);
 	if (IS_ERR(dentry) || !new_sb)
 		cgroup_put(&root->cgrp);
+	else if (root == &cgrp_dfl_root)
+		cgrp_dfl_root_visible = true;
+
 	return dentry;
 }
 
-- 
1.8.0.2

  parent reply	other threads:[~2014-06-03  4:05 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-03  4:04 [PATCH 1/3] cgroup: don't destroy the default root Li Zefan
2014-06-03  4:05 ` [PATCH 2/3] cgroup: make the default root invisible when it's umounted Li Zefan
     [not found]   ` <538D4982.10905-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2014-06-03 13:01     ` Tejun Heo
     [not found]       ` <20140603130144.GB26210-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-06-04  8:59         ` Li Zefan
     [not found]           ` <538EE00F.10406-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2014-06-05  1:20             ` Tejun Heo
2014-06-05  1:49               ` Li Zefan
     [not found] ` <538D4956.5050205-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2014-06-03  4:05   ` Li Zefan [this message]
     [not found]     ` <538D49A7.2010403-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
2014-06-03 13:02       ` [PATCH 3/3] cgroup: set visible flag only after we've mounted the default root Tejun Heo
2014-06-03 12:57   ` [PATCH 1/3] cgroup: don't destroy " Tejun Heo
     [not found]     ` <20140603125728.GA26210-Gd/HAXX7CRxy/B6EtB590w@public.gmane.org>
2014-06-04  8:40       ` Li Zefan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=538D49A7.2010403@huawei.com \
    --to=lizefan-hv44wf8li93qt0dzr+alfa@public.gmane.org \
    --cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).