From patchwork Fri Jul 6 06:27:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Sheng-Hui X-Patchwork-Id: 169335 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 6F49E2C00E7 for ; Fri, 6 Jul 2012 16:28:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932279Ab2GFG1x (ORCPT ); Fri, 6 Jul 2012 02:27:53 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:35196 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932139Ab2GFG1v (ORCPT ); Fri, 6 Jul 2012 02:27:51 -0400 Received: by pbbrp8 with SMTP id rp8so14088651pbb.19 for ; Thu, 05 Jul 2012 23:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=jrDXIWRItm9p6Y2FNdGYzRdmbqZGuZCuNL5wshAgT9U=; b=PZU+3CbXMUtfTY6w6hYn+YXNgaGfeE0j0jlV4IIpmDupacwl9FQHhHQOU4Yua4ccjL H5frSySFOiJMnwhMOARi55sCdq2+ug4ECH551+HZNq3JNvH58F+7CQWbhArPuzjugzYB 3P/J6uvCWrkCFTYfaZTF7/aNgjHIG5R/98Z6lQslVtWEqRhtY1ICDd2poJFfPHBm7gkH 5NfbiyhPkaz+2Y/LW8Jm/cpg+VOuFemaRx3gzf7qCIOd8ECQfe9twBFiZCTpS7Ka5bR6 5qGqDh2T+tniBuNfF7C9wLULfcx1rAOS/gtsYxt2nJVJ6HCHw4QtfjDV5kDCbhSwLtjX stWQ== Received: by 10.68.200.162 with SMTP id jt2mr34057663pbc.54.1341556070600; Thu, 05 Jul 2012 23:27:50 -0700 (PDT) Received: from [9.115.122.130] ([202.108.130.138]) by mx.google.com with ESMTPS id rs4sm21279909pbc.0.2012.07.05.23.27.47 (version=SSLv3 cipher=OTHER); Thu, 05 Jul 2012 23:27:49 -0700 (PDT) Message-ID: <4FF68560.7040102@gmail.com> Date: Fri, 06 Jul 2012 14:27:44 +0800 From: Wang Sheng-Hui User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.18) Gecko/20110617 Thunderbird/3.1.11 MIME-Version: 1.0 To: Theodore Ts'o , Andreas Dilger , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ext4: make extents.c/ext4_ext_try_to_merge return 1 on merged Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org In the old version, ext4_ext_try_to_merge would return 0 if merge left or no merge, and return 1 if merge right. Here make ext4_ext_try_to_merge return 1 on merged, and return 0 if no merge. Signed-off-by: Wang Sheng-Hui --- fs/ext4/extents.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 6c2a37d..7f6fb48 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -1657,7 +1657,7 @@ static int ext4_ext_try_to_merge_right(struct inode *inode, /* * This function tries to merge the @ex extent to neighbours in the tree. - * return 1 if merge left else 0. + * return 1 if merged else 0. */ static int ext4_ext_try_to_merge(struct inode *inode, struct ext4_ext_path *path, @@ -1665,7 +1665,6 @@ static int ext4_ext_try_to_merge(struct inode *inode, struct ext4_extent_header *eh; unsigned int depth; int merge_done = 0; - int ret = 0; depth = ext_depth(inode); BUG_ON(path[depth].p_hdr == NULL); @@ -1675,9 +1674,9 @@ static int ext4_ext_try_to_merge(struct inode *inode, merge_done = ext4_ext_try_to_merge_right(inode, path, ex - 1); if (!merge_done) - ret = ext4_ext_try_to_merge_right(inode, path, ex); + merge_done = ext4_ext_try_to_merge_right(inode, path, ex); - return ret; + return merge_done; } /*