From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 14 Oct 2012 08:57:37 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2015-05-18~412
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24980deeafda25e3a415a1acd20dc39c04b149c6;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	debugfs/htree.c
---

24980deeafda25e3a415a1acd20dc39c04b149c6
diff --cc debugfs/htree.c
index 1932962d4,29ddf9c56..2971812d5
--- a/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",