diff options
| author | Theodore Ts'o | 2018-02-19 05:45:18 +0100 |
|---|---|---|
| committer | Theodore Ts'o | 2018-02-19 05:45:18 +0100 |
| commit | fb7c02445c497943e7296cd3deee04422b63acb8 (patch) | |
| tree | a324e598b3ad8c07e0f9d94b48389094cd2f298a /fs/ext4 | |
| parent | ext4: eliminate sleep from shutdown ioctl (diff) | |
| download | kernel-qcow2-linux-fb7c02445c497943e7296cd3deee04422b63acb8.tar.gz kernel-qcow2-linux-fb7c02445c497943e7296cd3deee04422b63acb8.tar.xz kernel-qcow2-linux-fb7c02445c497943e7296cd3deee04422b63acb8.zip | |
ext4: pass -ESHUTDOWN code to jbd2 layer
Previously the jbd2 layer assumed that a file system check would be
required after a journal abort. In the case of the deliberate file
system shutdown, this should not be necessary. Allow the jbd2 layer
to distinguish between these two cases by using the ESHUTDOWN errno.
Also add proper locking to __journal_abort_soft().
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 16d3d1325f5b..9ac33a7cbd32 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c @@ -493,13 +493,13 @@ static int ext4_shutdown(struct super_block *sb, unsigned long arg) set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); if (sbi->s_journal && !is_journal_aborted(sbi->s_journal)) { (void) ext4_force_commit(sb); - jbd2_journal_abort(sbi->s_journal, 0); + jbd2_journal_abort(sbi->s_journal, -ESHUTDOWN); } break; case EXT4_GOING_FLAGS_NOLOGFLUSH: set_bit(EXT4_FLAGS_SHUTDOWN, &sbi->s_ext4_flags); if (sbi->s_journal && !is_journal_aborted(sbi->s_journal)) - jbd2_journal_abort(sbi->s_journal, 0); + jbd2_journal_abort(sbi->s_journal, -ESHUTDOWN); break; default: return -EINVAL; |