Merge branch 'maint' into next

Conflicts:
	resize/extent.c

diff --cc debugfs/set_fields.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc lib/e2p/ls.c
Simple merge

diff --cc lib/ext2fs/Makefile.in
Simple merge

diff --cc lib/ext2fs/ext2_fs.h
Simple merge

diff --cc lib/ext2fs/swapfs.c
Simple merge

diff --cc misc/e2freefrag.c
Simple merge

diff --cc resize/extent.c
index 0da8df6,f0fb1e0..94eb689
--- 1/resize/extent.c
--- 2/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);
 -                      mid = low + ((int) (range * (high-low)));
+                               if (range > 0.9)
+                                       range = 0.9;
+                               if (range < 0.1)
+                                       range = 0.1;
+                       }
 +                      mid = low + ((__u64) (range * (high-low)));
                }
  #endif
                if ((old_loc >= extent->list[mid].old_loc) &&

diff --cc resize/main.c
Simple merge