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

Commit bbd6851a authored by Al Viro's avatar Al Viro
Browse files

Push lock_super() into the ->remount_fs() of filesystems that care about it 



Note that since we can't run into contention between remount_fs and write_super
(due to exclusion on s_umount), we have to care only about filesystems that
touch lock_super() on their own.  Out of those ext3, ext4, hpfs, sysv and ufs
do need it; fat doesn't since its ->remount_fs() only accesses assign-once
data (basically, it's "we have no atime on directories and only have atime on
files for vfat; force nodiratime and possibly noatime into *flags").

[folded a build fix from hch]

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

fs/ext3/super.c

+3 −0
Original line number Diff line number Diff line
@@ -2491,6 +2491,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
#endif



	/* 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_resuid = sbi->s_resuid;
@@ -2598,6 +2599,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
		    old_opts.s_qf_names[i] != sbi->s_qf_names[i])

			kfree(old_opts.s_qf_names[i]);

#endif

	unlock_super(sb);

	return 0;

restore_opts:

	sb->s_flags = old_sb_flags;
@@ -2614,6 +2616,7 @@ static int ext3_remount (struct super_block * sb, int * flags, char * data) 
		sbi->s_qf_names[i] = old_opts.s_qf_names[i];

	}

#endif

	unlock_super(sb);

	return err;

}

fs/ext4/super.c

+3 −0
Original line number Diff line number Diff line
@@ -3421,6 +3421,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
#endif



	/* 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_resuid = sbi->s_resuid;
@@ -3554,6 +3555,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		    old_opts.s_qf_names[i] != sbi->s_qf_names[i])

			kfree(old_opts.s_qf_names[i]);

#endif

	unlock_super(sb);

	return 0;



restore_opts:
@@ -3573,6 +3575,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		sbi->s_qf_names[i] = old_opts.s_qf_names[i];

	}

#endif

	unlock_super(sb);

	return err;

}

fs/hpfs/super.c

+3 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) 
	

	*flags |= MS_NOATIME;

	

	lock_super(s);

	uid = sbi->sb_uid; gid = sbi->sb_gid;

	umask = 0777 & ~sbi->sb_mode;

	lowercase = sbi->sb_lowercase; conv = sbi->sb_conv;
@@ -430,9 +431,11 @@ static int hpfs_remount_fs(struct super_block *s, int *flags, char *data) 


	replace_mount_options(s, new_opts);



	unlock_super(s);

	return 0;



out_err:

	unlock_super(s);

	kfree(new_opts);

	return -EINVAL;

}

fs/super.c

+0 −2
Original line number Diff line number Diff line
@@ -556,9 +556,7 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force) 
	remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);



	if (sb->s_op->remount_fs) {

		lock_super(sb);

		retval = sb->s_op->remount_fs(sb, &flags, data);

		unlock_super(sb);

		if (retval)

			return retval;

	}

fs/sysv/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -61,10 +61,12 @@ static void sysv_write_super(struct super_block *sb) 
static int sysv_remount(struct super_block *sb, int *flags, char *data)

{

	struct sysv_sb_info *sbi = SYSV_SB(sb);

	lock_super(sb);

	if (sbi->s_forced_ro)

		*flags |= MS_RDONLY;

	if (!(*flags & MS_RDONLY))

		sb->s_dirt = 1;

	unlock_super(sb);

	return 0;

}