Commit a6d9946b authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: eliminate sleep from shutdown ioctl 



The msleep() when processing EXT4_GOING_FLAGS_NOLOGFLUSH was a hack to
avoid some races (that are now fixed), but in fact it introduced its
own race.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 576d18ed

fs/ext4/ioctl.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -498,10 +498,8 @@ static int ext4_shutdown(struct super_block *sb, unsigned long arg) 
		break;

		break;

	case EXT4_GOING_FLAGS_NOLOGFLUSH:

	case EXT4_GOING_FLAGS_NOLOGFLUSH:

		set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);

		set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags);

		if (sbi->s_journal && !is_journal_aborted(sbi->s_journal)) {

		if (sbi->s_journal && !is_journal_aborted(sbi->s_journal))

			msleep(100);

			jbd2_journal_abort(sbi->s_journal, 0);

			jbd2_journal_abort(sbi->s_journal, 0);

		}

		break;

		break;

	default:

	default:

		return -EINVAL;

		return -EINVAL;