diff options
| author | Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp> | 2006-12-22 12:11:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 19:55:51 +0300 |
| commit | 6f5a9da1af5a8c286575c30c2706dc1fbef9164b (patch) | |
| tree | 42678c62fe6196d8d9fb7917c1f0e890fb0f50e4 | |
| parent | 6d3a25f1fb75206ae8b2b1cdd1431b3852e1a45a (diff) | |
| download | linux-6f5a9da1af5a8c286575c30c2706dc1fbef9164b.tar.xz | |
[PATCH] jbd: wait for already submitted t_sync_datalist buffer to complete
In the current jbd code, if a buffer on BJ_SyncData list is dirty and not
locked, the buffer is refiled to BJ_Locked list, submitted to the IO and
waited for IO completion.
But the fsstress test showed the case that when a buffer was already
submitted to the IO just before the buffer_dirty(bh) check, the buffer was
not waited for IO completion.
Following patch solves this problem. If it is assumed that a buffer is
submitted to the IO before the buffer_dirty(bh) check and still being
written to disk, this buffer is refiled to BJ_Locked list.
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Cc: Jan Kara <jack@ucw.cz>
Cc: "Stephen C. Tweedie" <sct@redhat.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/jbd/commit.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 10be51290a27..be4648bc7a2f 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -248,8 +248,12 @@ write_out_data: bufs = 0; goto write_out_data; } - } - else { + } else if (!locked && buffer_locked(bh)) { + __journal_file_buffer(jh, commit_transaction, + BJ_Locked); + jbd_unlock_bh_state(bh); + put_bh(bh); + } else { BUFFER_TRACE(bh, "writeout complete: unfile"); __journal_unfile_buffer(jh); jbd_unlock_bh_state(bh); |