On Sun, Aug 11, 2019 at 02:35:51PM -0700, Eric Biggers wrote: > A few fixes and cleanups for fs-verity. > > If there are no objections, I'll fold these into the original patches. > > Eric Biggers (6): > fs-verity: fix crash on read error in build_merkle_tree_level() > ext4: skip truncate when verity in progress in ->write_begin() > f2fs: skip truncate when verity in progress in ->write_begin() > ext4: remove ext4_bio_encrypted() > ext4: fix comment in ext4_end_enable_verity() > f2fs: use EFSCORRUPTED in f2fs_get_verity_descriptor() > > fs/ext4/inode.c | 7 +++++-- > fs/ext4/readpage.c | 9 --------- > fs/ext4/verity.c | 2 +- > fs/f2fs/data.c | 2 +- > fs/f2fs/verity.c | 2 +- > fs/verity/enable.c | 24 ++++++++++++++++-------- > 6 files changed, 24 insertions(+), 22 deletions(-) > > -- > 2.22.0 > I've gone ahead and folded in these fixes. - Eric
