diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-01-24 10:11:07 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-02-02 07:50:00 -0700 |
| commit | a7c50c940477bae89fb2b4f51bd969a2d95d7512 (patch) | |
| tree | 23d5c1747a3e31bf57247e999e9305eae164e7ba /fs/crypto | |
| parent | 49add4966d79244013fce35f95c6833fae82b8b1 (diff) | |
| download | linux-stable-a7c50c940477bae89fb2b4f51bd969a2d95d7512.tar.gz linux-stable-a7c50c940477bae89fb2b4f51bd969a2d95d7512.tar.bz2 linux-stable-a7c50c940477bae89fb2b4f51bd969a2d95d7512.zip | |
block: pass a block_device and opf to bio_reset
Pass the block_device that we plan to use this bio for and the
operation to bio_reset to optimize the assigment. A NULL block_device
can be passed, both for the passthrough case on a raw request_queue and
to temporarily avoid refactoring some nasty code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220124091107.642561-20-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/bio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c index 755e985a42e0..2217fe5ece6f 100644 --- a/fs/crypto/bio.c +++ b/fs/crypto/bio.c @@ -80,9 +80,7 @@ static int fscrypt_zeroout_range_inline_crypt(const struct inode *inode, err = submit_bio_wait(bio); if (err) goto out; - bio_reset(bio); - bio_set_dev(bio, inode->i_sb->s_bdev); - bio->bi_opf = REQ_OP_WRITE; + bio_reset(bio, inode->i_sb->s_bdev, REQ_OP_WRITE); num_pages = 0; } } @@ -181,9 +179,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, err = submit_bio_wait(bio); if (err) goto out; - bio_reset(bio); - bio_set_dev(bio, inode->i_sb->s_bdev); - bio->bi_opf = REQ_OP_WRITE; + bio_reset(bio, inode->i_sb->s_bdev, REQ_OP_WRITE); } while (len != 0); err = 0; out: |