Merge branch 'maint' into next

diff --cc e2fsck/pass1.c
Simple merge

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

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

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