From patchwork Wed Jul 17 22:10:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 259783 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 DF6F92C00A9 for ; Thu, 18 Jul 2013 08:10:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757371Ab3GQWKW (ORCPT ); Wed, 17 Jul 2013 18:10:22 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37134 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756419Ab3GQWKV (ORCPT ); Wed, 17 Jul 2013 18:10:21 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id CDF36A538D; Thu, 18 Jul 2013 00:10:19 +0200 (CEST) Received: by quack.suse.cz (Postfix, from userid 1000) id A5E5280E5E; Thu, 18 Jul 2013 00:10:18 +0200 (CEST) From: Jan Kara To: Ted Tso Cc: linux-ext4@vger.kernel.org, Jan Kara , Zheng Liu Subject: [PATCH] ext4: Remove extent tree purging from ext4_da_page_release_reservation() Date: Thu, 18 Jul 2013 00:10:15 +0200 Message-Id: <1374099015-6829-1-git-send-email-jack@suse.cz> X-Mailer: git-send-email 1.8.1.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org ext4_da_page_release_reservation() gets called from ext4_da_invalidatepage(). This function is used when we are truncating page cache for punch hole or truncate operations. In either case these operations take care of removing extents from the extent tree. This is more efficient and the code in ext4_da_page_release_reservation() is actually buggy anyway. So just remove it. CC: Zheng Liu Signed-off-by: Jan Kara --- fs/ext4/inode.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 0188e65..98a9972 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1388,11 +1388,6 @@ static void ext4_da_page_release_reservation(struct page *page, curr_off = next_off; } while ((bh = bh->b_this_page) != head); - if (to_release) { - lblk = page->index << (PAGE_CACHE_SHIFT - inode->i_blkbits); - ext4_es_remove_extent(inode, lblk, to_release); - } - /* If we have released all the blocks belonging to a cluster, then we * need to release the reserved space for that cluster. */ num_clusters = EXT4_NUM_B2C(sbi, to_release);