From patchwork Thu Aug 4 03:48:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Dong X-Patchwork-Id: 108344 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 D7C80B6F62 for ; Thu, 4 Aug 2011 13:48:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895Ab1HDDsr (ORCPT ); Wed, 3 Aug 2011 23:48:47 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:64824 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755374Ab1HDDsr (ORCPT ); Wed, 3 Aug 2011 23:48:47 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so1253271pzk.1 for ; Wed, 03 Aug 2011 20:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=S2ePQEB6Qu/h3dI3U0xOOJtYWm2rfripmH8OAUVvEw4=; b=c+ysUYKXd4p2ONf/KycI9zJ04sEy6aaLUztDo5f3XW6NLbYrxQ+XElwlWdPwlYuTBJ cwY2EdwxWJiS7e1NesskBMqBRAE7IILa62gM2u090LnBW3dSiFKd58P2mNzQxsq3U3Ba luW3TvtbrPcW/mTPIGfEVNbFtJey7yNSp3Ors= Received: by 10.143.26.40 with SMTP id d40mr311270wfj.199.1312429723637; Wed, 03 Aug 2011 20:48:43 -0700 (PDT) Received: from localhost.localdomain ([110.75.120.250]) by mx.google.com with ESMTPS id d3sm1730817pbh.5.2011.08.03.20.48.41 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 20:48:43 -0700 (PDT) From: Robin Dong To: linux-ext4@vger.kernel.org Cc: Robin Dong , Ted Ts'o Subject: [PATCH 1/2 bigalloc] e2fsprogs: remove wrong EXT2FS_C2B in check_block_end Date: Thu, 4 Aug 2011 11:48:02 +0800 Message-Id: <1312429682-16970-2-git-send-email-hao.bigrat@gmail.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1312429682-16970-1-git-send-email-hao.bigrat@gmail.com> References: <1312429682-16970-1-git-send-email-hao.bigrat@gmail.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Robin Dong The argument "save_blocks_count" and the block bitmap has the unit of cluster, so it don't need EXT2FS_C2B to convert argument "i". This patch is based on "next" branch of e2fsprogs. Signed-off-by: Robin Dong Cc: Ted Ts'o --- e2fsck/pass5.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c index f9d746c..bb2a4dd 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -763,12 +763,10 @@ static void check_block_end(e2fsck_t ctx) /* Protect loop from wrap-around if end is maxed */ for (i = save_blocks_count + 1; i <= end && i > save_blocks_count; i++) { - if (!ext2fs_test_block_bitmap2(fs->block_map, - EXT2FS_C2B(fs, i))) { + if (!ext2fs_test_block_bitmap2(fs->block_map, i)) { if (fix_problem(ctx, PR_5_BLOCK_BMAP_PADDING, &pctx)) { for (; i <= end; i++) - ext2fs_mark_block_bitmap2(fs->block_map, - EXT2FS_C2B(fs, i)); + ext2fs_mark_block_bitmap2(fs->block_map, i); ext2fs_mark_bb_dirty(fs); } else ext2fs_unmark_valid(fs);