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

Commit b0895513 authored by J. R. Okajima's avatar J. R. Okajima Committed by Al Viro
Browse files

remove unlock_kernel() left accidentally 



commit 337eb00a
Push BKL down into ->remount_fs()
and
commit 4aa98cf7
Push BKL down into do_remount_sb()

were uncorrectly merged.
The former removes one pair of lock/unlock_kernel(), but the latter adds
several unlock_kernel(). Finally a few unlock_kernel() calls left.

Signed-off-by: default avatarJ. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 210ad6ae

fs/super.c

+3 −9
Original line number Diff line number Diff line
@@ -545,25 +545,19 @@ int do_remount_sb(struct super_block *sb, int flags, void *data, int force) 
	if ((flags & MS_RDONLY) && !(sb->s_flags & MS_RDONLY)) {

		if (force)

			mark_files_ro(sb);

		else if (!fs_may_remount_ro(sb)) {

			unlock_kernel();

		else if (!fs_may_remount_ro(sb))

			return -EBUSY;

		}

		retval = vfs_dq_off(sb, 1);

		if (retval < 0 && retval != -ENOSYS) {

			unlock_kernel();

		if (retval < 0 && retval != -ENOSYS)

			return -EBUSY;

	}

	}

	remount_rw = !(flags & MS_RDONLY) && (sb->s_flags & MS_RDONLY);



	if (sb->s_op->remount_fs) {

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

		if (retval) {

			unlock_kernel();

		if (retval)

			return retval;

	}

	}

	sb->s_flags = (sb->s_flags & ~MS_RMT_MASK) | (flags & MS_RMT_MASK);

	if (remount_rw)

		vfs_dq_quota_on_remount(sb);