Skip to contentSkip to conversation

cgroup: remove redundant variable in cgroup_mount()

PATCH In review Zefan Li 2 participants 2 messages Sep 20, 2014 cgroup

lore
Share & tools
lore

Zefan Li

author
#0 lore raw

PATCH 1/1 cgroup: remove redundant variable in cgroup_mount()

Both pinned_sb and new_sb indicate if a new superblock is needed, so we can just remove new_sb.

Note now we must check if kernfs_tryget_sb() returns NULL, because when it returns NULL, kernfs_mount() may still re-use an existing superblock, which is just allocated by another concurent mount.

Suggested-by Tejun Heo <[email protected]>
Signed-off-by Zefan Li <[email protected]>

---

Hi Tejun,

I think you wanted to see the @new_sb argument removed from kernfs_mount(), but it's also used in debugfs and we can't use kernfs_tryget_sb() to replace the new_sb check.

---
 kernel/cgroup.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
kernel/cgroup.c +4 -7
index 33f15b3..15a2387 100644
@@ -1694,7 +1694,6 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
 	struct dentry *dentry;
 	int ret;
 	int i;
-	bool new_sb;
 
 	/*
 	 * The first time anyone tries to mount a cgroup, enable the list

@@ -1785,7 +1784,7 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
 		 * path is super cold.  Let's just sleep a bit and retry.
 		 */
 		pinned_sb = kernfs_pin_sb(root->kf_root, NULL);
-		if (IS_ERR(pinned_sb) ||
+		if (IS_ERR_OR_NULL(pinned_sb) ||
 		    !percpu_ref_tryget_live(&root->cgrp.self.refcnt)) {
 			mutex_unlock(&cgroup_mutex);
 			if (!IS_ERR_OR_NULL(pinned_sb))

@@ -1831,18 +1830,16 @@ out_free:
 		return ERR_PTR(ret);
 
 	dentry = kernfs_mount(fs_type, flags, root->kf_root,
-				CGROUP_SUPER_MAGIC, &new_sb);
-	if (IS_ERR(dentry) || !new_sb)
+				CGROUP_SUPER_MAGIC, NULL);
+	if (IS_ERR(dentry) || pinned_sb)
 		cgroup_put(&root->cgrp);
 
 	/*
 	 * If @pinned_sb, we're reusing an existing root and holding an
 	 * extra ref on its sb.  Mount is complete.  Put the extra ref.
 	 */
-	if (pinned_sb) {
-		WARN_ON(new_sb);
+	if (pinned_sb)
 		deactivate_super(pinned_sb);
-	}
 
 	return dentry;
 }
Signature · 1 line
1.8.0.2
maintainer
#1 lore raw

Hello, Li.

Quoted 9 lines · Zefan Li

Both pinned_sb and new_sb indicate if a new superblock is needed, so we can just remove new_sb.

Note now we must check if kernfs_tryget_sb() returns NULL, because when it returns NULL, kernfs_mount() may still re-use an existing superblock, which is just allocated by another concurent mount.

Suggested-by Tejun Heo <[email protected]>
Signed-off-by Zefan Li <[email protected]>

Ah, this is so much better. Thanks for doing this. Applied to cgroup/for-3.18.

Quoted 7 lines

---

Hi Tejun,

I think you wanted to see the @new_sb argument removed from kernfs_mount(), but it's also used in debugfs and we can't use kernfs_tryget_sb() to replace the new_sb check.

Bummer, someday. :)

Thanks.

Signature · 1 line
tejun