Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f5bbff9 authored by Al Viro's avatar Al Viro
Browse files

Convert obvious places to deactivate_locked_super() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 74dbbdd7

drivers/mtd/mtdsuper.c

+1 −2
Original line number Diff line number Diff line
@@ -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_super(sb);

		deactivate_locked_super(sb);

		return ret;

	}

fs/9p/vfs_super.c

+1 −4
Original line number Diff line number Diff line
@@ -174,10 +174,7 @@ P9_DPRINTK(P9_DEBUG_VFS, " simple set mount, return 0\n"); 
	return 0;



release_sb:

	if (sb) {

		up_write(&sb->s_umount);

		deactivate_super(sb);

	}

	deactivate_locked_super(sb);



free_stat:

	kfree(st);

fs/afs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -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_super(sb);

			deactivate_locked_super(sb);

			goto error;

		}

		sb->s_options = new_opts;

fs/btrfs/super.c

+4 −8
Original line number Diff line number Diff line
@@ -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_super(s);

			deactivate_locked_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_super(s);

			deactivate_locked_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_super(s);

			deactivate_locked_super(s);

			error = PTR_ERR(root);

			goto error_free_subvol_name;

		}

		if (!root->d_inode) {

			dput(root);

			up_write(&s->s_umount);

			deactivate_super(s);

			deactivate_locked_super(s);

			error = -ENXIO;

			goto error_free_subvol_name;

		}

fs/cifs/cifsfs.c

+1 −2
Original line number Diff line number Diff line
@@ -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_super(sb);

		deactivate_locked_super(sb);

		return rc;

	}

	sb->s_flags |= MS_ACTIVE;