From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 19 Jul 2010 06:37:41 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db0bdb49f49fc3dd14c12439d934a3403a3be9f1;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	resize/extent.c
---

db0bdb49f49fc3dd14c12439d934a3403a3be9f1
diff --cc resize/extent.c
index 0da8df6d1,f0fb1e006..94eb689c0
--- a/resize/extent.c
+++ b/resize/extent.c
@@@ -167,10 -167,15 +167,15 @@@ __u64 ext2fs_extent_translate(ext2_exte
  				range = 0;
  			else if (old_loc > highval)
  				range = 1;
- 			else
+ 			else {
  				range = ((float) (old_loc - lowval)) /
  					(highval - lowval);
+ 				if (range > 0.9)
+ 					range = 0.9;
+ 				if (range < 0.1)
+ 					range = 0.1;
+ 			}
 -			mid = low + ((int) (range * (high-low)));
 +			mid = low + ((__u64) (range * (high-low)));
  		}
  #endif
  		if ((old_loc >= extent->list[mid].old_loc) &&