From patchwork Wed Apr 16 18:33:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Czerner X-Patchwork-Id: 339696 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 B99A81400D5 for ; Thu, 17 Apr 2014 04:33:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755648AbaDPSdm (ORCPT ); Wed, 16 Apr 2014 14:33:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21646 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755420AbaDPSdk (ORCPT ); Wed, 16 Apr 2014 14:33:40 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3GIXebw026913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Apr 2014 14:33:40 -0400 Received: from localhost.localdomain.com (vpn1-4-33.ams2.redhat.com [10.36.4.33]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s3GIXZ7F007833; Wed, 16 Apr 2014 14:33:38 -0400 From: Lukas Czerner To: linux-ext4@vger.kernel.org Cc: linkinjeon@gmail.com, Lukas Czerner Subject: [PATCH 3/5] ext4: No need to truncate pagecache twice in collapse range Date: Wed, 16 Apr 2014 20:33:00 +0200 Message-Id: <1397673182-5326-3-git-send-email-lczerner@redhat.com> In-Reply-To: <1397673182-5326-1-git-send-email-lczerner@redhat.com> References: <1397673182-5326-1-git-send-email-lczerner@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org We're already calling truncate_pagecache_range() before we attempt to do any actual job so there is not need to truncate pagecache once more using truncate_setsize() after we're finished. Remove truncate_setsize() and replace it just with i_size_write() note that we're holding appropriate locks. Signed-off-by: Lukas Czerner --- fs/ext4/extents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 25ed60f..9cd762c 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -5442,7 +5442,7 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) } new_size = i_size_read(inode) - len; - truncate_setsize(inode, new_size); + i_size_write(inode, new_size); EXT4_I(inode)->i_disksize = new_size; ext4_discard_preallocations(inode);