diff options
| author | Dmitry Monakhov <dmonakhov@openvz.org> | 2014-10-01 22:23:15 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-10-01 22:23:15 -0400 |
| commit | c5d311926da483951bd5da637ed65de8614d1901 (patch) | |
| tree | 17845b002830f2f71caedaf3056802e563e6879c /fs/ext4/ext4_jbd2.c | |
| parent | bce92d566a57893e98ec83e4e5447f860d2889b7 (diff) | |
| download | linux-stable-c5d311926da483951bd5da637ed65de8614d1901.tar.gz linux-stable-c5d311926da483951bd5da637ed65de8614d1901.tar.bz2 linux-stable-c5d311926da483951bd5da637ed65de8614d1901.zip | |
ext4: fix over-defensive complaint after journal abort
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index 0074e0d23d6e..3445035c7e01 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -256,8 +256,8 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, set_buffer_prio(bh); if (ext4_handle_valid(handle)) { err = jbd2_journal_dirty_metadata(handle, bh); - /* Errors can only happen if there is a bug */ - if (WARN_ON_ONCE(err)) { + /* Errors can only happen due to aborted journal or a nasty bug */ + if (!is_handle_aborted(handle) && WARN_ON_ONCE(err)) { ext4_journal_abort_handle(where, line, __func__, bh, handle, err); if (inode == NULL) { |