On Fri, Feb 21, 2020 at 03:50:48AM -0800, Satya Tangirala wrote: > diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c > index 4fa18fff9c4e..82d06cf4b94a 100644 > --- a/fs/crypto/bio.c > +++ b/fs/crypto/bio.c > @@ -24,6 +24,8 @@ > #include <linux/module.h> > #include <linux/bio.h> > #include <linux/namei.h> > +#include <linux/fscrypt.h> No need to include <linux/fscrypt.h> explicitly here, since everything in fs/crypto/ already gets it via "fscrypt_private.h". > +static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, > + pgoff_t lblk, sector_t pblk, > + unsigned int len) > +{ > + const unsigned int blockbits = inode->i_blkbits; > + const unsigned int blocks_per_page = 1 << (PAGE_SHIFT - blockbits); > + struct bio *bio; > + int ret, err = 0; > + int num_pages = 0; > + > + /* This always succeeds since __GFP_DIRECT_RECLAIM is set. */ > + bio = bio_alloc(GFP_NOFS, BIO_MAX_PAGES); > + > + while (len) { > + unsigned int blocks_this_page = min(len, blocks_per_page); > + unsigned int bytes_this_page = blocks_this_page << blockbits; > + > + if (num_pages == 0) { > + fscrypt_set_bio_crypt_ctx(bio, inode, lblk, GFP_NOIO); This should use GFP_NOFS rather than the stricter GFP_NOIO. > + bio_set_dev(bio, inode->i_sb->s_bdev); > + bio->bi_iter.bi_sector = > + pblk << (blockbits - SECTOR_SHIFT); > + bio_set_op_attrs(bio, REQ_OP_WRITE, 0); > + } > + ret = bio_add_page(bio, ZERO_PAGE(0), bytes_this_page, 0); > + if (WARN_ON(ret != bytes_this_page)) { > + err = -EIO; > + goto out; > + } > + num_pages++; > + len -= blocks_this_page; > + lblk += blocks_this_page; > + pblk += blocks_this_page; > + if (num_pages == BIO_MAX_PAGES || !len) { > + err = submit_bio_wait(bio); > + if (!err && bio->bi_status) > + err = -EIO; submit_bio_wait() already checks bi_status and reflects it in the returned error, so checking it again here is redundant. > @@ -69,12 +119,17 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, > unsigned int nr_pages; > unsigned int i; > unsigned int offset; > + const bool inlinecrypt = fscrypt_inode_uses_inline_crypto(inode); > struct bio *bio; > int ret, err; > > if (len == 0) > return 0; > > + if (inlinecrypt) > + return fscrypt_zeroout_range_inline_crypt(inode, lblk, pblk, > + len); > + No need for the 'inlinecrypt' bool variable. Just do: if (fscrypt_inode_uses_inline_crypto(inode)) FYI, I had suggested a merge resolution to use here which didn't have the above problems. Looks like you missed it? https://lkml.kernel.org/linux-block/20200114211243.GC41220@xxxxxxxxx/ - Eric