Merge branch 'maint' into next

Conflicts:
	debugfs/htree.c

diff --cc debugfs/htree.c
index 1932962d4fb3230271d2529886ed935f5b0a78b4,29ddf9c5639977a965b1f9ed2aedcf279a686fee..2971812d5800bdf4631e63087f2b403b59645841
--- 1/debugfs/htree.c
--- 2/debugfs/htree.c
+++ b/debugfs/htree.c
@@@ -57,8 -52,8 +57,8 @@@ static void htree_dump_leaf_node(ext2_f
                return;
        }
  
-       printf("Reading directory block %llu, phys %llu\n", blk, pblk);
+       fprintf(pager, "Reading directory block %llu, phys %llu\n", blk, pblk);
 -      errcode = ext2fs_read_dir_block2(current_fs, pblk, buf, 0);
 +      errcode = ext2fs_read_dir_block4(current_fs, pblk, buf, 0, ino);
        if (errcode) {
                com_err("htree_dump_leaf_node", errcode,
                        "while reading block %llu (%llu)\n",