From patchwork Thu Jul 25 11:56:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Liu X-Patchwork-Id: 261676 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 21CC72C0090 for ; Thu, 25 Jul 2013 21:57:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755616Ab3GYL45 (ORCPT ); Thu, 25 Jul 2013 07:56:57 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:58521 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755834Ab3GYL4r (ORCPT ); Thu, 25 Jul 2013 07:56:47 -0400 Received: by mail-pb0-f44.google.com with SMTP id wy7so662201pbc.31 for ; Thu, 25 Jul 2013 04:56:47 -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; bh=O/Mg5HaV8kCrhl6oBq0Si7CePxcv/00Vi0tNxE7Ccps=; b=L/YAXTqua13KEN44CkneUzDOjHia59fmvDj3XI67KBKK9LjTm/MYPbjLNMkloBTTAC xKRLpEZpLZ5hcqkwslOZOc8StSJBgPxDyuu7KGDkPktNljR7FyWaLUqPguiTUBHiVWAg XbctbWojQbcGga3a2EeuXfTYPC1uMHGlAXJXAyZSYTY2zOjJYUBhCZYMjwRAdRx25esc BMJL2NWMWR+GeNrGj6vIsX/iQdXVfzpk1dKPx0IEctorDjpy5EeYH83QoWFQvp3IVkmO agkX6WVfxOTSZ+OGDZzEfdi5US6S/6xtAv2tsne/qtwZ9faVcD6ssYWiriW2sEELROS+ huqQ== X-Received: by 10.68.97.229 with SMTP id ed5mr47779405pbb.37.1374753407475; Thu, 25 Jul 2013 04:56:47 -0700 (PDT) Received: from lz-devel.taobao.ali.com ([182.92.247.2]) by mx.google.com with ESMTPSA id x8sm53618275pbb.39.2013.07.25.04.56.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 04:56:46 -0700 (PDT) From: Zheng Liu To: linux-ext4@vger.kernel.org Cc: Zheng Liu , "Theodore Ts'o" Subject: [PATCH] ext4: don't re-try to remove the entry from es tree when we encounter a ENOMEM in ext4_ext_truncate Date: Thu, 25 Jul 2013 19:56:37 +0800 Message-Id: <1374753397-26432-1-git-send-email-wenqing.lz@taobao.com> X-Mailer: git-send-email 1.7.9.7 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zheng Liu ext4_es_remove_extent returns ENOMEM only if we need to split an entry and insert a part into es tree. After applied this commit (e15f742c), we have retried to do this. So we don't need to do this again in ext4_ext_truncate(). Signed-off-by: Zheng Liu Cc: "Theodore Ts'o" --- fs/ext4/extents.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index a618738..4404297 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4409,14 +4409,8 @@ void ext4_ext_truncate(handle_t *handle, struct inode *inode) last_block = (inode->i_size + sb->s_blocksize - 1) >> EXT4_BLOCK_SIZE_BITS(sb); -retry: err = ext4_es_remove_extent(inode, last_block, EXT_MAX_BLOCKS - last_block); - if (err == ENOMEM) { - cond_resched(); - congestion_wait(BLK_RW_ASYNC, HZ/50); - goto retry; - } if (err) { ext4_std_error(inode->i_sb, err); return;