Merge branch 'maint' into next

Conflicts:
	debugfs/htree.c
This commit is contained in:
Theodore Ts'o 2012-10-14 04:57:37 -04:00
commit 24980deeaf

View File

@ -57,7 +57,7 @@ static void htree_dump_leaf_node(ext2_filsys fs, ext2_ino_t ino,
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_block4(current_fs, pblk, buf, 0, ino);
if (errcode) {
com_err("htree_dump_leaf_node", errcode,