From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 16 Aug 2002 21:07:06 +0000 (-0400)
Subject: Fix stupid typo in previous changeset.
X-Git-Tag: E2FSPROGS-1.28-WIP-0817~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ccd488a764c14b27983b92435deca5e1adf9061;p=thirdparty%2Fe2fsprogs.git

Fix stupid typo in previous changeset.
---

diff --git a/debugfs/icheck.c b/debugfs/icheck.c
index 75044a623..c08d55861 100644
--- a/debugfs/icheck.c
+++ b/debugfs/icheck.c
@@ -110,7 +110,8 @@ void do_icheck(int argc, char **argv)
 			goto next;
 
 		if (inode.i_file_acl) {
-			icheck_proc(fs, &inode.i_file_acl, 0, 0, 0, &bw);
+			icheck_proc(current_fs, &inode.i_file_acl, 0,
+				    0, 0, &bw);
 			if (bw.blocks_left == 0)
 				break;
 		}
diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 042e562be..4dd2b33f8 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -941,7 +941,7 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
 	int			group;
 	char			*block_buf = 0;
 	ext2_ino_t		start_to_move;
-	blk_t			orig_size;
+	blk_t			orig_size, new_block;
 	
 	if ((rfs->old_fs->group_desc_count <=
 	     rfs->new_fs->group_desc_count) &&
@@ -998,8 +998,8 @@ static errcode_t inode_scan_and_fix(ext2_resize_t rfs)
 		pb.is_dir = LINUX_S_ISDIR(inode.i_mode);
 		pb.changed = 0;
 
-		if (inode.i_file.acl && rfs->bmap) {
-			new_block = ext2fs_extent_translate(pb->rfs->bmap, 
+		if (inode.i_file_acl && rfs->bmap) {
+			new_block = ext2fs_extent_translate(rfs->bmap, 
 							    inode.i_file_acl);
 			if (new_block) {
 				inode.i_file_acl = new_block;