Convert obvious places to deactivate_locked_super()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

drivers/mtd/mtdsuper.c

@@ -74,8 +74,7 @@ static int get_sb_mtd_aux(struct file_system_type *fs_type, int flags,
 
 	ret = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
 	if (ret < 0) {
-		up_write(&sb->s_umount);
+		deactivate_locked_super(sb);
-		deactivate_super(sb);
 		return ret;
 	}
 

fs/9p/vfs_super.c

@@ -174,10 +174,7 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n");
 	return 0;
 
 release_sb:
-	if (sb) {
+	deactivate_locked_super(sb);
-		up_write(&sb->s_umount);
-		deactivate_super(sb);
-	}
 
 free_stat:
 	kfree(st);

fs/afs/super.c

@@ -405,8 +405,7 @@ static int afs_get_sb(struct file_system_type *fs_type,
 		sb->s_flags = flags;
 		ret = afs_fill_super(sb, &params);
 		if (ret < 0) {
-			up_write(&sb->s_umount);
+			deactivate_locked_super(sb);
-			deactivate_super(sb);
 			goto error;
 		}
 		sb->s_options = new_opts;

fs/btrfs/super.c

@@ -502,8 +502,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 
 	if (s->s_root) {
 		if ((flags ^ s->s_flags) & MS_RDONLY) {
-			up_write(&s->s_umount);
+			deactivate_locked_super(s);
-			deactivate_super(s);
 			error = -EBUSY;
 			goto error_close_devices;
 		}
@@ -517,8 +516,7 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		error = btrfs_fill_super(s, fs_devices, data,
 					 flags & MS_SILENT ? 1 : 0);
 		if (error) {
-			up_write(&s->s_umount);
+			deactivate_locked_super(s);
-			deactivate_super(s);
 			goto error_free_subvol_name;
 		}
 
@@ -535,15 +533,13 @@ static int btrfs_get_sb(struct file_system_type *fs_type, int flags,
 		mutex_unlock(&s->s_root->d_inode->i_mutex);
 
 		if (IS_ERR(root)) {
-			up_write(&s->s_umount);
+			deactivate_locked_super(s);
-			deactivate_super(s);
 			error = PTR_ERR(root);
 			goto error_free_subvol_name;
 		}
 		if (!root->d_inode) {
 			dput(root);
-			up_write(&s->s_umount);
+			deactivate_locked_super(s);
-			deactivate_super(s);
 			error = -ENXIO;
 			goto error_free_subvol_name;
 		}

fs/cifs/cifsfs.c

@@ -602,8 +602,7 @@ cifs_get_sb(struct file_system_type *fs_type,
 
 	rc = cifs_read_super(sb, data, dev_name, flags & MS_SILENT ? 1 : 0);
 	if (rc) {
-		up_write(&sb->s_umount);
+		deactivate_locked_super(sb);
-		deactivate_super(sb);
 		return rc;
 	}
 	sb->s_flags |= MS_ACTIVE;

fs/devpts/inode.c

@@ -389,11 +389,10 @@ static int devpts_get_sb(struct file_system_type *fs_type,
 	return 0;
 
 out_dput:
-	dput(s->s_root);
+	dput(s->s_root); /* undo dget() in simple_set_mnt() */
 
 out_undo_sget:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	return error;
 }
 

fs/ecryptfs/main.c

@@ -614,9 +614,8 @@ static int ecryptfs_get_sb(struct file_system_type *fs_type, int flags,
 	}
 	goto out;
 out_abort:
-	dput(sb->s_root);
+	dput(sb->s_root); /* aka mnt->mnt_root, as set by get_sb_nodev() */
-	up_write(&sb->s_umount);
+	deactivate_locked_super(sb);
-	deactivate_super(sb);
 out:
 	return rc;
 }

fs/libfs.c

@@ -246,8 +246,7 @@ int get_sb_pseudo(struct file_system_type *fs_type, char *name,
 	return 0;
 
 Enomem:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	return -ENOMEM;
 }
 

fs/nfs/super.c

@@ -2111,8 +2111,7 @@ out_err_nosb:
 error_splat_root:
 	dput(mntroot);
 error_splat_super:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	goto out;
 }
 
@@ -2208,8 +2207,7 @@ out_err_noserver:
 	return error;
 
 error_splat_super:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	dprintk("<-- nfs_xdev_get_sb() = %d [splat]\n", error);
 	return error;
 }
@@ -2469,8 +2467,7 @@ out_free:
 error_splat_root:
 	dput(mntroot);
 error_splat_super:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	goto out;
 }
 
@@ -2564,8 +2561,7 @@ out_err_noserver:
 	return error;
 
 error_splat_super:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	dprintk("<-- nfs4_xdev_get_sb() = %d [splat]\n", error);
 	return error;
 }
@@ -2649,8 +2645,7 @@ out_err_noserver:
 	return error;
 
 error_splat_super:
-	up_write(&s->s_umount);
+	deactivate_locked_super(s);
-	deactivate_super(s);
 	dprintk("<-- nfs4_referral_get_sb() = %d [splat]\n", error);
 	return error;
 }

fs/proc/root.c

@@ -67,8 +67,7 @@ static int proc_get_sb(struct file_system_type *fs_type,
 		sb->s_flags = flags;
 		err = proc_fill_super(sb);
 		if (err) {
-			up_write(&sb->s_umount);
+			deactivate_locked_super(sb);
-			deactivate_super(sb);
 			return err;
 		}
 

fs/ubifs/super.c

@@ -2055,8 +2055,7 @@ static int ubifs_get_sb(struct file_system_type *fs_type, int flags,
 	return 0;
 
 out_deact:
-	up_write(&sb->s_umount);
+	deactivate_locked_super(sb);
-	deactivate_super(sb);
 out_close:
 	ubi_close_volume(ubi);
 	return err;

kernel/cgroup.c

@@ -1133,8 +1133,7 @@ static int cgroup_get_sb(struct file_system_type *fs_type,
  free_cg_links:
 	free_cg_links(&tmp_cg_links);
  drop_new_super:
-	up_write(&sb->s_umount);
+	deactivate_locked_super(sb);
-	deactivate_super(sb);
 	return ret;
 }