From patchwork Sat Apr 18 06:05:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Dokos X-Patchwork-Id: 26148 Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 1276AB7079 for ; Sat, 18 Apr 2009 16:10:43 +1000 (EST) Received: by ozlabs.org (Postfix) id ECDB3DE17C; Sat, 18 Apr 2009 16:10:42 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 92C3FDE17B for ; Sat, 18 Apr 2009 16:10:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751023AbZDRGKl (ORCPT ); Sat, 18 Apr 2009 02:10:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751596AbZDRGKl (ORCPT ); Sat, 18 Apr 2009 02:10:41 -0400 Received: from qmta13.emeryville.ca.mail.comcast.net ([76.96.27.243]:45408 "EHLO QMTA13.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751023AbZDRGKk (ORCPT ); Sat, 18 Apr 2009 02:10:40 -0400 X-Greylist: delayed 349 seconds by postgrey-1.27 at vger.kernel.org; Sat, 18 Apr 2009 02:10:40 EDT Received: from OMTA07.emeryville.ca.mail.comcast.net ([76.96.30.59]) by QMTA13.emeryville.ca.mail.comcast.net with comcast id gtq01b0011GXsucADu4rz6; Sat, 18 Apr 2009 06:04:51 +0000 Received: from gamaville.dokosmarshall.org ([24.34.105.88]) by OMTA07.emeryville.ca.mail.comcast.net with comcast id gu4p1b0071uT3cw8Tu4qhS; Sat, 18 Apr 2009 06:04:51 +0000 Received: from gamaville.dokosmarshall.org (localhost [127.0.0.1]) by gamaville.dokosmarshall.org (Postfix) with ESMTP id F38A5341EB; Sat, 18 Apr 2009 02:05:04 -0400 (EDT) From: Nick Dokos To: linux-ext4@vger.kernel.org cc: nicholas.dokos@hp.com, Theodore Ts'o , Valerie Aurora Reply-to: nicholas.dokos@hp.com Subject: [PATCH 1/2][64-BIT] blk_t -> blk64_t in read_bitmaps(). X-Mailer: MH-E 8.1; nmh 1.2; GNU Emacs 23.0.91 Date: Sat, 18 Apr 2009 02:05:04 -0400 Message-ID: <30393.1240034704@gamaville.dokosmarshall.org> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org e2fsck -n -f on a brand-new, never-mounted 32TiB filesystem was detecting a lot of "Block bitmap differences". This change makes them go away (there are are still more problems however: the run finds used blocks in one BLOCK_UNINIT group and a free block mismatch.) Signed-off-by: Nick Dokos Reviewed-by: Eric Sandeen Signed-off-by: Valerie Aurora (Henson) --- lib/ext2fs/rw_bitmaps.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ext2fs/rw_bitmaps.c b/lib/ext2fs/rw_bitmaps.c index cee6142..5b504bf 100644 --- a/lib/ext2fs/rw_bitmaps.c +++ b/lib/ext2fs/rw_bitmaps.c @@ -144,9 +144,9 @@ static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block) int csum_flag = 0; int do_image = fs->flags & EXT2_FLAG_IMAGE_FILE; unsigned int cnt; - blk_t blk; - blk_t blk_itr = fs->super->s_first_data_block; - blk_t blk_cnt; + blk64_t blk; + blk64_t blk_itr = fs->super->s_first_data_block; + blk64_t blk_cnt; ext2_ino_t ino_itr = 1; ext2_ino_t ino_cnt;