From: akpm@osdl.org Subject: [patch 50/52] jbd: wait for already submitted t_sync_datalist buffer to complete Date: Fri, 22 Dec 2006 01:11:50 -0800 Message-ID: <200612220911.kBM9BoCG018874@shell0.pdx.osdl.net> Cc: akpm@osdl.org, hifumi.hisashi@oss.ntt.co.jp, jack@ucw.cz, linux-ext4@vger.kernel.org, sct@redhat.com Return-path: Received: from smtp.osdl.org ([65.172.181.25]:59333 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945999AbWLVJMQ (ORCPT ); Fri, 22 Dec 2006 04:12:16 -0500 To: torvalds@osdl.org Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org From: Hisashi Hifumi 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 Cc: Jan Kara Cc: "Stephen C. Tweedie" Cc: Signed-off-by: Andrew Morton --- fs/jbd/commit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff -puN fs/jbd/commit.c~jbd-wait-for-already-submitted-t_sync_datalist-buffer fs/jbd/commit.c --- a/fs/jbd/commit.c~jbd-wait-for-already-submitted-t_sync_datalist-buffer +++ a/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); _