From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760001AbYENEtA (ORCPT ); Wed, 14 May 2008 00:49:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752067AbYENEsw (ORCPT ); Wed, 14 May 2008 00:48:52 -0400 Received: from mail7.hitachi.co.jp ([133.145.228.42]:55842 "EHLO mail7.hitachi.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751664AbYENEsv (ORCPT ); Wed, 14 May 2008 00:48:51 -0400 X-AuditID: 0ac90648-aab78ba000000c2f-f3-482a6f31872e Message-ID: <482A6F2B.3020605@hitachi.com> Date: Wed, 14 May 2008 13:48:43 +0900 From: Hidehiro Kawai User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja-JP; rv:1.4) Gecko/20030624 Netscape/7.1 (ax) X-Accept-Language: ja MIME-Version: 1.0 To: Andrew Morton , sct@redhat.com, adilger@clusterfs.com Cc: Hidehiro Kawai , linux-kernel@vger.kernel.org, linux-ext4@vger.kernel.org, Jan Kara , Josef Bacik , Mingming Cao , Satoshi OSHIMA , sugita Subject: [PATCH 2/4] jbd: ordered data integrity fix (rebased) References: <482A6E00.6080303@hitachi.com> In-Reply-To: <482A6E00.6080303@hitachi.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Subject: [PATCH 2/4] jbd: ordered data integrity fix In ordered mode, if a buffer being dirtied exists in the committing transaction, we write the buffer to the disk, move it from the committing transaction to the running transaction, then dirty it. But we don't have to remove the buffer from the committing transaction when the buffer couldn't be written out, otherwise it breaks the ordered mode rule. Signed-off-by: Hidehiro Kawai --- fs/jbd/transaction.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) Index: linux-2.6.26-rc2/fs/jbd/transaction.c =================================================================== --- linux-2.6.26-rc2.orig/fs/jbd/transaction.c +++ linux-2.6.26-rc2/fs/jbd/transaction.c @@ -954,9 +954,10 @@ int journal_dirty_data(handle_t *handle, journal_t *journal = handle->h_transaction->t_journal; int need_brelse = 0; struct journal_head *jh; + int ret = 0; if (is_handle_aborted(handle)) - return 0; + return ret; jh = journal_add_journal_head(bh); JBUFFER_TRACE(jh, "entry"); @@ -1067,7 +1068,16 @@ int journal_dirty_data(handle_t *handle, time if it is redirtied */ } - /* journal_clean_data_list() may have got there first */ + /* + * We shouldn't remove the buffer from the committing + * transaction if it has failed to be written. + * Otherwise, it breaks the ordered mode rule. + */ + if (unlikely(!buffer_uptodate(bh))) { + ret = -EIO; + goto no_journal; + } + if (jh->b_transaction != NULL) { JBUFFER_TRACE(jh, "unfile from commit"); __journal_temp_unlink_buffer(jh); @@ -1108,7 +1118,7 @@ no_journal: } JBUFFER_TRACE(jh, "exit"); journal_put_journal_head(jh); - return 0; + return ret; } /**