From patchwork Sun Jul 22 07:59:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 172500 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 9334E2C0143 for ; Sun, 22 Jul 2012 17:51:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751551Ab2GVHvl (ORCPT ); Sun, 22 Jul 2012 03:51:41 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:34290 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751458Ab2GVHvi (ORCPT ); Sun, 22 Jul 2012 03:51:38 -0400 Received: by mail-pb0-f46.google.com with SMTP id rp8so8911989pbb.19 for ; Sun, 22 Jul 2012 00:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=pIz+n27Fg+0Di694jaYD+ugrP+l1YjSGEaFaVaVOXqo=; b=UJiKBECWlDY1tsNZBbdHRjplKwPtJfYKL9ElPiZrsIEg/4EMhBCMmizhrhtuw+oGaC OPoKGy8cmfISOiqSmmpr0Ni5n2YxFez86uojlEjpq3Dx8L/Um4FmBFF8Fxko/n1DMwhL xfFjOmPsyNUpwGl/YZlWGqOBRVVBOUzYBu7MDVroPj1pkPOrYs2pbmz4UjUxCFogGAPJ 2ovZyfo912Her5tgAK0InZ4sscpmNYU+42Jm8Xbtqd78SpQKglyer6ky9IgL1XbXqJ0C MuAPlttFFbisheqB62n7ES7tDdxoGvT3j4aM5RxyLmsH6YGCQJYwpJUCSHdT9Aw4s9h3 lTsQ== Received: by 10.68.221.227 with SMTP id qh3mr26193966pbc.115.1342943498393; Sun, 22 Jul 2012 00:51:38 -0700 (PDT) Received: from localhost.localdomain ([182.92.247.2]) by mx.google.com with ESMTPS id ny4sm7497988pbb.57.2012.07.22.00.51.36 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 22 Jul 2012 00:51:38 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: xiaoqiangnk@gmail.com, achender@linux.vnet.ibm.com, wenqing.lz@taobao.com Subject: [RFC][PATCH 09/10 v1][RESEND] ext4: don't need to writeout all dirty pages in punch hole Date: Sun, 22 Jul 2012 15:59:45 +0800 Message-Id: <1342943986-12413-10-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1342943986-12413-1-git-send-email-wenqing.lz@taobao.com> References: <1342943986-12413-1-git-send-email-wenqing.lz@taobao.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu Now we don't need to writeout all dirty pages when punching a hole. The i_mutex locking is taken to avoid concurrent writes. In truncate_pagecache_range, all pages in this hole is released, and ext4_es_remove_space is called to update extent status tree. Signed-off-by: Zheng Liu --- fs/ext4/extents.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index f2c5294..2a526b4 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4529,9 +4529,11 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) loff_t first_page_offset, last_page_offset; int credits, err = 0; + mutex_lock(&inode->i_mutex); + /* No need to punch hole beyond i_size */ if (offset >= inode->i_size) - return 0; + goto error; /* * If the hole extends beyond i_size, set the hole @@ -4549,18 +4551,6 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) first_page_offset = first_page << PAGE_CACHE_SHIFT; last_page_offset = last_page << PAGE_CACHE_SHIFT; - /* - * Write out all dirty pages to avoid race conditions - * Then release them. - */ - if (mapping->nrpages && mapping_tagged(mapping, PAGECACHE_TAG_DIRTY)) { - err = filemap_write_and_wait_range(mapping, - offset, offset + length - 1); - - if (err) - return err; - } - /* Now release the pages */ if (last_page_offset > first_page_offset) { truncate_pagecache_range(inode, first_page_offset, @@ -4572,12 +4562,14 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) credits = ext4_writepage_trans_blocks(inode); handle = ext4_journal_start(inode, credits); - if (IS_ERR(handle)) - return PTR_ERR(handle); + if (IS_ERR(handle)) { + err = PTR_ERR(handle); + goto error; + } err = ext4_orphan_add(handle, inode); if (err) - goto out; + goto error; /* * Now we need to zero out the non-page-aligned data in the @@ -4652,6 +4644,8 @@ int ext4_ext_punch_hole(struct file *file, loff_t offset, loff_t length) ext4_ext_invalidate_cache(inode); ext4_discard_preallocations(inode); + err = ext4_es_remove_space(inode, first_block, + stop_block - first_block); err = ext4_ext_remove_space(inode, first_block, stop_block - 1); ext4_ext_invalidate_cache(inode); @@ -4667,6 +4661,8 @@ out: inode->i_mtime = inode->i_ctime = ext4_current_time(inode); ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); +error: + mutex_unlock(&inode->i_mutex); return err; } int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,