From patchwork Sun Jan 23 03:36:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Katiyar X-Patchwork-Id: 80049 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 7CCE8B7103 for ; Sun, 23 Jan 2011 14:37:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780Ab1AWDg7 (ORCPT ); Sat, 22 Jan 2011 22:36:59 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:40896 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752730Ab1AWDg7 (ORCPT ); Sat, 22 Jan 2011 22:36:59 -0500 Received: by qwa26 with SMTP id 26so2978154qwa.19 for ; Sat, 22 Jan 2011 19:36:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:from:date:message-id:subject:to:cc :content-type; bh=ztyLJ0oOha9SzuG6CQvPfpHTbaHVE6ARX7YvkfA50LU=; b=DT6kkSXZWgBz6yNHRGQbnzPQLA4jqUcS+qemBCgM/1vfM80Hk7J0g7YlqEi+qpFyJj xO/drID0SEof476I8HLmfAO5bnXwMAEtJSCJi+Ad85MJZj2q+igZ5Mn5RyZjdgikVw8M hZbPD2Pob7Up+6/RQL9Rs7HEsLWmIiuWC21zE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:cc:content-type; b=hYt5pF8YyWXjoKKadSsGWXTL8Kowk79KhKB2e8nuRi622ESehy8TnuaTOVYw9I+NHb m5y4vY9T8D4H5iAPve9vcuzJp+4vI3y8im2k3YmKwvrbv+5kknZxhMRCcqhSWLbsfUX9 8+m9KYhRx18cQize59ak1/8ifPXNK/XYyWBp8= Received: by 10.229.233.196 with SMTP id jz4mr2327150qcb.135.1295753818487; Sat, 22 Jan 2011 19:36:58 -0800 (PST) MIME-Version: 1.0 Received: by 10.229.84.139 with HTTP; Sat, 22 Jan 2011 19:36:38 -0800 (PST) From: Manish Katiyar Date: Sat, 22 Jan 2011 19:36:38 -0800 Message-ID: Subject: [PATCH 3/3] : Update ocfs2 for the changed jbd2 transaction allocation routines To: Jan Kara , ext4 Cc: mkatiyar@gmail.com Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Hi Jan, Update ocfs2 to use the updated transaction allocation routine. They still pass the old flag. Signed-off-by: Manish Katiyar --- fs/ocfs2/journal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) @@ -444,7 +444,7 @@ int ocfs2_extend_trans(handle_t *handle, int nblocks) "jbd2_journal_extend failed, trying " "jbd2_journal_restart\n"); status = jbd2_journal_restart(handle, - old_nblocks + nblocks); + old_nblocks + nblocks, false); if (status < 0) { mlog_errno(status); goto bail; diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index faa2303..6435a58 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -356,11 +356,11 @@ handle_t *ocfs2_start_trans(struct ocfs2_super *osb, int max_buffs) /* Nested transaction? Just return the handle... */ if (journal_current_handle()) - return jbd2_journal_start(journal, max_buffs); + return jbd2_journal_start(journal, max_buffs, false); down_read(&osb->journal->j_trans_barrier); - handle = jbd2_journal_start(journal, max_buffs); + handle = jbd2_journal_start(journal, max_buffs, false); if (IS_ERR(handle)) { up_read(&osb->journal->j_trans_barrier);