From patchwork Sat Apr 27 04:30:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish Sangwan X-Patchwork-Id: 240076 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 7E7282C0109 for ; Sat, 27 Apr 2013 14:31:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751813Ab3D0Ebk (ORCPT ); Sat, 27 Apr 2013 00:31:40 -0400 Received: from mail-da0-f41.google.com ([209.85.210.41]:53883 "EHLO mail-da0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751300Ab3D0Ebk (ORCPT ); Sat, 27 Apr 2013 00:31:40 -0400 Received: by mail-da0-f41.google.com with SMTP id p8so631395dan.0 for ; Fri, 26 Apr 2013 21:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=k6SYRPzZIbDauwsl1gzqUbR9gb+eobMJSUpFmBV0gb8=; b=z1OOBCGbqffheoMp/5yz7Q6iv6B1jnBVzpRV8PrsRay1iXEd8viRf2QOlrRvxlKE0V u+2tKm049UOCGssRxrj1qDBHwqZqfZ0qDxFRdHdbROSekWWjPjL037BkzoHH1TKtE58m kFWPPLNrg2UCsB56DYctMAsgLBfa+el/2Z+Nqe6hBQ+tQf2FC9t5ZBa2vIN7EVujMAbv h2DCWdF0bRzoK2vVaUcPMyTSpdf0W6mofj0J2esnsVa9fCwpF+KM3VNFoEW8mkNnA+Vs X2f8aH6/7gim+MTJSDSL3QAocam+52izFlF8nkXy2vzx8gdFRMzk5atO2xPL80k5Wwub BaJA== X-Received: by 10.66.150.165 with SMTP id uj5mr33921149pab.37.1367037099446; Fri, 26 Apr 2013 21:31:39 -0700 (PDT) Received: from localhost.localdomain ([117.55.243.86]) by mx.google.com with ESMTPSA id vb8sm14291160pbc.11.2013.04.26.21.31.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 21:31:38 -0700 (PDT) From: Ashish Sangwan To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org, wenqing.lz@taobao.com, Ashish Sangwan , Namjae Jeon Subject: [PATCH] ext4: remove unneeded call to ext4_es_remove_extent in punch hole Date: Sat, 27 Apr 2013 10:00:53 +0530 Message-Id: <1367037053-1893-1-git-send-email-ashish.sangwan2@gmail.com> X-Mailer: git-send-email 1.7.11.4 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Ashish Sangwan During punch hole, before removing extents we make sure that the blocks are commited to disk by calling filemap_write_and_wait_range. So, the extents cannot be present on extent status tree. Signed-off-by: Ashish Sangwan Signed-off-by: Namjae Jeon --- fs/ext4/inode.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 50cced9..944eb15 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3749,13 +3749,6 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length) down_write(&EXT4_I(inode)->i_data_sem); ext4_discard_preallocations(inode); - ret = ext4_es_remove_extent(inode, first_block, - stop_block - first_block); - if (ret) { - up_write(&EXT4_I(inode)->i_data_sem); - goto out_stop; - } - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) ret = ext4_ext_remove_space(inode, first_block, stop_block - 1);