ChangeLog, badblocks.8.in, mke2fs.c:

  badblocks.8: Update documentation to note that output format of
  	badblocks is suitable for use with e2fsck -l or mke2fs -l.
  mke2fs.c (handle_bad_blocks): Fix bug so that all groups with bad
  	superblock backup blocks are printed (not just the first one).

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 51a2969..0c778e9 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,13 @@
+Sun Feb  1 16:53:36 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * badblocks.8: Update documentation to note that output format
+               of badblocks is suitable for use with e2fsck -l or
+               mke2fs -l.
+
+       * mke2fs.c (handle_bad_blocks): Fix bug so that all groups with
+               bad superblock backup blocks are printed (not just the
+               first one).
+
 Mon Dec  1 17:01:04 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * badblocks.8.in: Add documentation for the -s option.

diff --git a/misc/badblocks.8.in b/misc/badblocks.8.in
index a9eacd8..ca42e99 100644 (file)
--- a/misc/badblocks.8.in
+++ b/misc/badblocks.8.in
@@ -40,7 +40,11 @@ Specify the size of blocks in bytes.
 .I -o output_file
 Write the list of bad blocks to the specified file. Without this option,
 .B badblocks
-displays the list on its standard output.
+displays the list on its standard output.  The format of this file is suitable
+for use by the -l option in 
+.BR e2fsck (8)
+or
+.BR mke2fs (8).
 .TP
 .I -s
 Show the progress of the scan by writing out the block numbers as they

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 47dfc42..b00e385 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -259,9 +259,9 @@ static void handle_bad_blocks(ext2_filsys fs, badblocks_list bb_list)
         */
        group_block = fs->super->s_first_data_block +
                fs->super->s_blocks_per_group;
-       group_bad = 0;
        
        for (i = 1; i < fs->group_desc_count; i++) {
+               group_bad = 0;
                for (j=0; j < fs->desc_blocks+1; j++) {
                        if (badblocks_list_test(bb_list, group_block +
                                                j)) {