Merge branch 'maint' into next

Conflicts:
	e2fsck/journal.c
	e2fsck/pass1.c
	e2fsck/pass2.c
	misc/mke2fs.c

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc e2fsck/journal.c
index 57783ebbfa943177b8ef801dacc8a0c41126880f,64a0fd627ba4356e0bbcdc195493cfda22c514b0..c2f8951a215acb177d7087ad3ed6c46b245a4150
--- 1/e2fsck/journal.c
--- 2/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@@ -214,8 -214,8 +214,8 @@@ static int process_journal_block(ext2_f
  
        p = (struct process_block_struct *) priv_data;
  
-       if (blk < fs->super->s_first_data_block ||
+       if (!blk || blk < fs->super->s_first_data_block ||
 -          blk >= fs->super->s_blocks_count)
 +          blk >= ext2fs_blocks_count(fs->super))
                return BLOCK_ABORT;
  
        if (blockcnt >= 0)

diff --cc e2fsck/pass1.c
index 3c6f91ce34bc05e79e718f66c752ce53656cf312,4bf80d255f9e2f8bcef264c1dc9a811b398b25bb..ade5ff654e51ffa0d3e7d1181271644e4e58422c
--- 1/e2fsck/pass1.c
--- 2/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@@ -1690,8 -1694,9 +1695,9 @@@ static void scan_extent_node(e2fsck_t c
                is_dir = LINUX_S_ISDIR(pctx->inode->i_mode);
  
                problem = 0;
-               if (extent.e_pblk < ctx->fs->super->s_first_data_block ||
+               if (extent.e_pblk == 0 ||
+                   extent.e_pblk < ctx->fs->super->s_first_data_block ||
 -                  extent.e_pblk >= ctx->fs->super->s_blocks_count)
 +                  extent.e_pblk >= ext2fs_blocks_count(ctx->fs->super))
                        problem = PR_1_EXTENT_BAD_START_BLK;
                else if (extent.e_lblk < start_block)
                        problem = PR_1_OUT_OF_ORDER_EXTENTS;

diff --cc e2fsck/pass2.c
index 29a0174a471346a3e0beaaf958fde9fe7034ce36,2847901b4caa7a674dec7b76db980d62d9156d50..1300e3874da01580da281b9d0946b8b873782b51
--- 1/e2fsck/pass2.c
--- 2/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@@ -1007,13 -1007,18 +1007,18 @@@ out_htree
                        }
                }
  
-               if (!(ext2fs_test_inode_bitmap2(ctx->inode_used_map,
-                                              dirent->inode))) {
-                       /*
-                        * If the inode is unused, offer to clear it.
-                        */
+               /* 
+                * Offer to clear unused inodes; if we are going to be
+                * restarting the scan due to bg_itable_unused being
+                * wrong, then don't clear any inodes to avoid zapping
+                * inodes that were skipped during pass1 due to an
+                * incorrect bg_itable_unused; we'll get any real
+                * problems after we restart.
+                */
+               if (!(ctx->flags & E2F_FLAG_RESTART_LATER) &&
 -                  !(ext2fs_test_inode_bitmap(ctx->inode_used_map,
 -                                             dirent->inode)))
++                  !(ext2fs_test_inode_bitmap2(ctx->inode_used_map,
++                                              dirent->inode)))
                        problem = PR_2_UNUSED_INODE;
-               }
  
                if (problem) {
                        if (fix_problem(ctx, problem, &cd->pctx)) {

diff --cc e2fsck/super.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc lib/e2p/e2p.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/mke2fs.c
index 022c12cb6c45984ca4f630d1b564f782acf35351,ac87b8ec9cea5f0df6f14b699ffc6facf7f1e37a..ca39d905bedc5cd371babd9faafda6b808879df7
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -1617,9 -1679,20 +1626,22 @@@ got_size
                if ((blocksize < 0) && (use_bsize < (-blocksize)))
                        use_bsize = -blocksize;
                blocksize = use_bsize;
 -              fs_param.s_blocks_count /= blocksize / 1024;
 +              ext2fs_blocks_count_set(&fs_param,
 +                                      ext2fs_blocks_count(&fs_param) /
 +                                      (blocksize / 1024));
+       } else {
+               if (blocksize < lsector_size ||                 /* Impossible */
+                   (!force && (blocksize < psector_size))) {   /* Suboptimal */
+                       com_err(program_name, EINVAL,
+                               _("while setting blocksize; too small "
+                                 "for device\n"));
+                       exit(1);
+               } else if (blocksize < psector_size) {
+                       fprintf(stderr, _("Warning: specified blocksize %d is "
+                               "less than device physical sectorsize %d, "
+                               "forced to continue\n"), blocksize,
+                               psector_size);
+               }
        }
  
        if (inode_ratio == 0) {

diff --cc misc/tune2fs.c
Simple merge

diff --cc misc/util.c
Simple merge

diff --cc resize/main.c
Simple merge

diff --cc tests/f_bad_disconnected_inode/expect.1
Simple merge