ext4: shutdown should not prevent get_write_access
authorTheodore Ts'o <tytso@mit.edu>
Mon, 19 Feb 2018 03:07:36 +0000 (22:07 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Apr 2018 07:36:30 +0000 (09:36 +0200)
commit 576d18ed60f5465110087c5e0eb1010de13e374d upstream.

The ext4 forced shutdown flag needs to prevent new handles from being
started, but it needs to allow existing handles to complete.  So the
forced shutdown flag should not force ext4_journal_get_write_access to
fail.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/ext4/ext4_jbd2.c

index 2d593201cf7a0b012d7a537ac74186cc3c7b0eff..7c70b08d104c002e129415d197728d2e6f014e35 100644 (file)
@@ -166,13 +166,6 @@ int __ext4_journal_get_write_access(const char *where, unsigned int line,
        might_sleep();
 
        if (ext4_handle_valid(handle)) {
-               struct super_block *sb;
-
-               sb = handle->h_transaction->t_journal->j_private;
-               if (unlikely(ext4_forced_shutdown(EXT4_SB(sb)))) {
-                       jbd2_journal_abort_handle(handle);
-                       return -EIO;
-               }
                err = jbd2_journal_get_write_access(handle, bh);
                if (err)
                        ext4_journal_abort_handle(where, line, __func__, bh,