diff options
| author | Chris Mason <mason@suse.com> | 2006-02-01 12:06:49 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 17:53:26 +0100 |
| commit | 3d4492f81dd7b486f1be0616a1ce7f73760f406e (patch) | |
| tree | 5161d47d236e18bdb5a1cdafc21e2a55d8de4d15 /fs/reiserfs | |
| parent | [PATCH] reiserfs: reiserfs hang and performance fix for data=journal mode (diff) | |
| download | linux-3d4492f81dd7b486f1be0616a1ce7f73760f406e.tar.xz linux-3d4492f81dd7b486f1be0616a1ce7f73760f406e.zip | |
[PATCH] reiserfs: reiserfs write_ordered_buffers should not oops on dirty non-uptodate bh
write_ordered_buffers should handle dirty non-uptodate buffers without a
BUG()
Signed-off-by: Chris Mason <mason@suse.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/reiserfs')
| -rw-r--r-- | fs/reiserfs/journal.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 1b2402a9a8e1..47c9f432dea5 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -846,6 +846,14 @@ static int write_ordered_buffers(spinlock_t * lock, spin_lock(lock); goto loop_next; } + /* in theory, dirty non-uptodate buffers should never get here, + * but the upper layer io error paths still have a few quirks. + * Handle them here as gracefully as we can + */ + if (!buffer_uptodate(bh) && buffer_dirty(bh)) { + clear_buffer_dirty(bh); + ret = -EIO; + } if (buffer_dirty(bh)) { list_del_init(&jh->list); list_add(&jh->list, &tmp); @@ -1030,9 +1038,12 @@ static int flush_commit_list(struct super_block *s, } if (!list_empty(&jl->j_bh_list)) { + int ret; unlock_kernel(); - write_ordered_buffers(&journal->j_dirty_buffers_lock, - journal, jl, &jl->j_bh_list); + ret = write_ordered_buffers(&journal->j_dirty_buffers_lock, + journal, jl, &jl->j_bh_list); + if (ret < 0 && retval == 0) + retval = ret; lock_kernel(); } BUG_ON(!list_empty(&jl->j_bh_list)); |