From patchwork Sun Feb 27 09:54:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 84683 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 9A3FEB70D8 for ; Sun, 27 Feb 2011 20:54:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884Ab1B0Jy3 (ORCPT ); Sun, 27 Feb 2011 04:54:29 -0500 Received: from mail-qw0-f46.google.com ([209.85.216.46]:54003 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878Ab1B0Jy3 (ORCPT ); Sun, 27 Feb 2011 04:54:29 -0500 Received: by qwd7 with SMTP id 7so2192408qwd.19 for ; Sun, 27 Feb 2011 01:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to:cc :content-type; bh=3bEQsW5/Ij8m7RTIf9cKffwAVhTezucNVsONCovjfmc=; b=rkHGmluEEzS+Ho1FeDsLXgWfOXwC2ArQa3K91D84OkOMt8p0q8FpbIeHRZIg0eXu/n fy2RL99kzieNcVcOrp5SD8tDd9tc+h8usBS1pEK0x8I5tlNApp7O6E4PiSXdKjmaEJnh I7sS21+vse0ck4dzHAVVUkY8BwDNNISgyBWpM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=CCUPIfrt6wWrMo/csQ6JMae77ThvdMLMpA9+jW96uSktuvZmJp+Z3b+N2zVTHAIg6h e+TAZWMOGvSWagcv8UELh6mJGp2gRpo5RHi+GYGFE5wP1EztoZNlDVJ4Ex5CxAa0fRCD 8zYyd75m7WLN40iQtb55bTrk6hBQg9y57/zTw= MIME-Version: 1.0 Received: by 10.229.250.4 with SMTP id mm4mr3528475qcb.266.1298800468240; Sun, 27 Feb 2011 01:54:28 -0800 (PST) Received: by 10.229.96.71 with HTTP; Sun, 27 Feb 2011 01:54:28 -0800 (PST) Date: Sun, 27 Feb 2011 11:54:28 +0200 Message-ID: Subject: [PATCH] ext4: nblocks arg to ext4_truncate_restart_trans() is ignored From: Amir Goldstein To: Theodore Tso , Jan Kara Cc: Ext4 Developers List Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org nblocks is passed into ext4_truncate_restart_trans() from ext4_ext_truncate_extend_restart() with a value different from the default blocks_for_truncate(), but is being ignored. The two other calls to ext4_truncate_restart_trans() already pass the default value, which is then being recalculated inside the function. Fix the problem by using the passed argument. Signed-off-by: Amir Goldstein --- fs/ext4/inode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9f7f9e4..33b970c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -173,7 +173,7 @@ int ext4_truncate_restart_trans(handle_t *handle, struct inode *inode, BUG_ON(EXT4_JOURNAL(inode) == NULL); jbd_debug(2, "restarting handle %p\n", handle); up_write(&EXT4_I(inode)->i_data_sem); - ret = ext4_journal_restart(handle, blocks_for_truncate(inode)); + ret = ext4_journal_restart(handle, nblocks); down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode);