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

Commit 07724f98 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: drop lock_super()/unlock_super() 



We don't need lock_super()/unlock_super() any more, since the places
where it is used, we are protected by the s_umount r/w semaphore.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: Marco Stornelli <marco.stornelli@gmail.com>
parent 0e376b1e

fs/ext4/super.c

+1 −10
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ static void ext4_put_super(struct super_block *sb) 
	flush_workqueue(sbi->dio_unwritten_wq);

	destroy_workqueue(sbi->dio_unwritten_wq);



	lock_super(sb);

	if (sbi->s_journal) {

		err = jbd2_journal_destroy(sbi->s_journal);

		sbi->s_journal = NULL;
@@ -928,7 +927,6 @@ static void ext4_put_super(struct super_block *sb) 
	 * Now that we are completely done shutting down the

	 * superblock, we need to actually destroy the kobject.

	 */

	unlock_super(sb);

	kobject_put(&sbi->s_kobj);

	wait_for_completion(&sbi->s_kobj_unregister);

	if (sbi->s_chksum_driver)
@@ -4535,11 +4533,9 @@ static int ext4_unfreeze(struct super_block *sb) 
	if (sb->s_flags & MS_RDONLY)

		return 0;



	lock_super(sb);

	/* Reset the needs_recovery flag before the fs is unlocked. */

	EXT4_SET_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_RECOVER);

	ext4_commit_super(sb, 1);

	unlock_super(sb);

	return 0;

}
@@ -4575,7 +4571,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	char *orig_data = kstrdup(data, GFP_KERNEL);



	/* Store the original options */

	lock_super(sb);

	old_sb_flags = sb->s_flags;

	old_opts.s_mount_opt = sbi->s_mount_opt;

	old_opts.s_mount_opt2 = sbi->s_mount_opt2;
@@ -4717,7 +4712,6 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
	if (sbi->s_journal == NULL)

		ext4_commit_super(sb, 1);



	unlock_super(sb);

#ifdef CONFIG_QUOTA

	/* Release old quota file names */

	for (i = 0; i < MAXQUOTAS; i++)
@@ -4730,12 +4724,10 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		else if (EXT4_HAS_RO_COMPAT_FEATURE(sb,

					EXT4_FEATURE_RO_COMPAT_QUOTA)) {

			err = ext4_enable_quotas(sb);

			if (err) {

				lock_super(sb);

			if (err)

				goto restore_opts;

		}

	}

	}

#endif



	ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
@@ -4760,7 +4752,6 @@ restore_opts: 
		sbi->s_qf_names[i] = old_opts.s_qf_names[i];

	}

#endif

	unlock_super(sb);

	kfree(orig_data);

	return err;

}