From patchwork Fri Mar 12 17:26:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 47683 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 07245B7CED for ; Sat, 13 Mar 2010 04:26:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933469Ab0CLR05 (ORCPT ); Fri, 12 Mar 2010 12:26:57 -0500 Received: from mail-bw0-f209.google.com ([209.85.218.209]:49965 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933363Ab0CLR05 (ORCPT ); Fri, 12 Mar 2010 12:26:57 -0500 Received: by bwz1 with SMTP id 1so1247685bwz.21 for ; Fri, 12 Mar 2010 09:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=hzoNmyrHhM0Qf401feNqZF/zIL49aaQCZbtfmwi3H2E=; b=Sz7UlFT3LCn7y6s58EvThk6SxlQcCb09G9nACqylgertNEbLmV6Wycovd9CAz50+GA Pas6i3DQg5peJOWydxOc3VZ5vPaQdNIYLogwe4n6LVevNYg7dhIwJ/Zzfa7BHHVJuR3e Eyx/5H0rbiJJrsd3xqnQ5SgmO4htqJSVpZHuc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=fkdu/KatTDcU1ZZeDIutwXe9RtO+iPobBtfyuHM+3nsCW7DleZOAKoHsJ/aH7vwVoa tWq5ojC7LfOKFs3khvAKmNfUq6FrwOltacu8z+Dj9vdipBCEnOnPaPod7NhjL+zudJHa mhkeQBQ8d1XU4ZFe0ZC5ZgjK/4wzjbNOcajfY= Received: by 10.204.144.86 with SMTP id y22mr2973650bku.43.1268414815679; Fri, 12 Mar 2010 09:26:55 -0800 (PST) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id 16sm936012bwz.13.2010.03.12.09.26.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 12 Mar 2010 09:26:55 -0800 (PST) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: Dmitry Monakhov Subject: [PATCH 1/2] ext4/jbd2: fix io-barrier logic in case of external journal Date: Fri, 12 Mar 2010 20:26:49 +0300 Message-Id: <1268414810-17289-1-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.6.3.3 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Currently journalled mode is still broken if fs use external journal. This is because all data handled as metadata. We must to issue io-barrier to fs_device even if transaction has only metadata blocks. Also add missed return value check. Signed-off-by: Dmitry Monakhov --- fs/ext4/fsync.c | 2 +- fs/jbd2/commit.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c index 98bd140..eb52837 100644 --- a/fs/ext4/fsync.c +++ b/fs/ext4/fsync.c @@ -101,7 +101,7 @@ int ext4_sync_file(struct file *file, struct dentry *dentry, int datasync) (journal->j_fs_dev != journal->j_dev) && (journal->j_flags & JBD2_BARRIER)) blkdev_issue_flush(inode->i_sb->s_bdev, NULL); - jbd2_log_wait_commit(journal, commit_tid); + ret = jbd2_log_wait_commit(journal, commit_tid); } else if (journal->j_flags & JBD2_BARRIER) blkdev_issue_flush(inode->i_sb->s_bdev, NULL); return ret; diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 1bc74b6..2f62f1b 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -682,6 +682,9 @@ void jbd2_journal_commit_transaction(journal_t *journal) tag->t_flags |= cpu_to_be32(JBD2_FLAG_LAST_TAG); start_journal_io: + if (bufs) + commit_transaction->t_flushed_data_blocks = 1; + for (i = 0; i < bufs; i++) { struct buffer_head *bh = wbuf[i]; /*