diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2011-09-04 10:18:14 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-09-04 10:18:14 -0400 |
| commit | 9ea7a0df63630ad8197716cd313ea66e28906fc0 (patch) | |
| tree | 2f9cb8bb3f4c709aa666c7863b496f2757b261fb /fs/ext4/ext4_jbd2.c | |
| parent | 56889787cfa77dfd96f0b3a3e6a4f26c2e4a5134 (diff) | |
| download | linux-0-day-9ea7a0df63630ad8197716cd313ea66e28906fc0.tar.gz linux-0-day-9ea7a0df63630ad8197716cd313ea66e28906fc0.tar.xz | |
jbd2: add debugging information to jbd2_journal_dirty_metadata()
Add debugging information in case jbd2_journal_dirty_metadata() is
called with a buffer_head which didn't have
jbd2_journal_get_write_access() called on it, or if the journal_head
has the wrong transaction in it. In addition, return an error code.
This won't change anything for ocfs2, which will BUG_ON() the non-zero
exit code.
For ext4, the caller of this function is ext4_handle_dirty_metadata(),
and on seeing a non-zero return code, will call __ext4_journal_stop(),
which will print the function and line number of the (buggy) calling
function and abort the journal. This will allow us to recover instead
of bug halting, which is better from a robustness and reliability
point of view.
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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index f5240aa15601a..aca1790175824 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -109,9 +109,11 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, if (ext4_handle_valid(handle)) { err = jbd2_journal_dirty_metadata(handle, bh); - if (err) - ext4_journal_abort_handle(where, line, __func__, - bh, handle, err); + if (err) { + /* Errors can only happen if there is a bug */ + handle->h_err = err; + __ext4_journal_stop(where, line, handle); + } } else { if (inode) mark_buffer_dirty_inode(bh, inode); |