Merge "Fix e2fsck denials introduced by latest e2fsprogs merge."