From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 22 Jan 2003 23:28:15 +0000 (-0500)
Subject: pass1.c (check_blocks): Use the EXT2_I_SIZE macro.
X-Git-Tag: E2FSPROGS-1_33-WIP-0306~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f489285b63a9146b0408d0672d53d4871735f96;p=thirdparty%2Fe2fsprogs.git

pass1.c (check_blocks): Use the EXT2_I_SIZE macro.
---

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index ec072823a..e494be835 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-22  Theodore Ts'o  <tytso@mit.edu>
+
+	* pass1.c (check_blocks): Use the EXT2_I_SIZE macro.
+
 2003-01-02  Theodore Ts'o  <tytso@mit.edu>
 
 	* unix.c (main): Detect if there is an attempt to run the journal
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index f7ee11178..a78f08b6c 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1318,7 +1318,7 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
 				bad_size = 2;
 		}
 	} else {
-		size = inode->i_size | ((__u64) inode->i_size_high << 32);
+		size = EXT2_I_SIZE(inode);
 		if ((pb.last_block >= 0) &&
 		    (size < pb.last_block * fs->blocksize))
 			bad_size = 3;