From: Hidehiro Kawai Subject: [PATCH 1/4] jbd: strictly check for write errors on data buffers (rebased) Date: Wed, 14 May 2008 13:47:31 +0900 Message-ID: <482A6EE3.90901@hitachi.com> References: <482A6E00.6080303@hitachi.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Hidehiro Kawai , linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, Jan Kara , Josef Bacik , Mingming Cao , Satoshi OSHIMA , sugita To: Andrew Morton , sct@redhat.com, adilger@clusterfs.com Return-path: Received: from mail9.hitachi.co.jp ([133.145.228.44]:37531 "EHLO mail9.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751981AbYENEri (ORCPT ); Wed, 14 May 2008 00:47:38 -0400 In-Reply-To: <482A6E00.6080303@hitachi.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: Subject: [PATCH 1/4] jbd: strictly check for write errors on data buffers In ordered mode, we should abort journaling when an I/O error has occurred on a file data buffer in the committing transaction. But there can be data buffers which are not checked for error: (a) the buffer which has already been written out by pdflush (b) the buffer which has been unlocked before scanned in the t_locked_list loop This patch adds missing error checks and aborts journaling appropriately. Signed-off-by: Hidehiro Kawai --- fs/jbd/commit.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Index: linux-2.6.26-rc2/fs/jbd/commit.c =================================================================== --- linux-2.6.26-rc2.orig/fs/jbd/commit.c +++ linux-2.6.26-rc2/fs/jbd/commit.c @@ -172,7 +172,7 @@ static void journal_do_submit_data(struc /* * Submit all the data buffers to disk */ -static void journal_submit_data_buffers(journal_t *journal, +static int journal_submit_data_buffers(journal_t *journal, transaction_t *commit_transaction) { struct journal_head *jh; @@ -180,6 +180,7 @@ static void journal_submit_data_buffers( int locked; int bufs = 0; struct buffer_head **wbuf = journal->j_wbuf; + int err = 0; /* * Whenever we unlock the journal and sleep, things can get added @@ -253,6 +254,8 @@ write_out_data: put_bh(bh); } else { BUFFER_TRACE(bh, "writeout complete: unfile"); + if (unlikely(!buffer_uptodate(bh))) + err = -EIO; __journal_unfile_buffer(jh); jbd_unlock_bh_state(bh); if (locked) @@ -271,6 +274,8 @@ write_out_data: } spin_unlock(&journal->j_list_lock); journal_do_submit_data(wbuf, bufs); + + return err; } /* @@ -410,8 +415,7 @@ void journal_commit_transaction(journal_ * Now start flushing things to disk, in the order they appear * on the transaction lists. Data blocks go first. */ - err = 0; - journal_submit_data_buffers(journal, commit_transaction); + err = journal_submit_data_buffers(journal, commit_transaction); /* * Wait for all previously submitted IO to complete. @@ -426,10 +430,10 @@ void journal_commit_transaction(journal_ if (buffer_locked(bh)) { spin_unlock(&journal->j_list_lock); wait_on_buffer(bh); - if (unlikely(!buffer_uptodate(bh))) - err = -EIO; spin_lock(&journal->j_list_lock); } + if (unlikely(!buffer_uptodate(bh))) + err = -EIO; if (!inverted_lock(journal, bh)) { put_bh(bh); spin_lock(&journal->j_list_lock);