ChangeLog, mke2fs.c, badblocks.c:
  Pass the blocksize to the bad blocks command so that all of the
  filesystem gets tested in the case where the blocksize 2048 or 4096.
ChangeLog, badblocks.c:
  Fix bug where ext2fs_badblocks_list_test would test the list (and
  exceed array boundaries) if there were no bad blocks on the bad blocks
  list.  (Showed up when user tried: mke2fs -c -b 4096).

diff --git a/e2fsck/badblocks.c b/e2fsck/badblocks.c
index c81baae..e6ab4bc 100644
--- a/e2fsck/badblocks.c
+++ b/e2fsck/badblocks.c
@@ -71,8 +71,8 @@
 			fatal_error(0);
 		}
 	} else {
-		sprintf(buf, "badblocks %s%s %d", preen ? "" : "-s ",
-			fs->device_name,
+		sprintf(buf, "badblocks -b %d %s%s %d", fs->blocksize,
+			preen ? "" : "-s ", fs->device_name,
 			fs->super->s_blocks_count);
 		f = popen(buf, "r");
 		if (!f) {