lkml.org 
[lkml]   [2021]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 16/34] fs/direct-io: use bio_new in dio_bio_alloc
    Date
    Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    ---
    fs/crypto/bio.c | 2 +-
    fs/direct-io.c | 6 ++----
    2 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c
    index 20dab9bdf098..28cd62ce853e 100644
    --- a/fs/crypto/bio.c
    +++ b/fs/crypto/bio.c
    @@ -148,7 +148,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk,
    return -EINVAL;

    /* This always succeeds since __GFP_DIRECT_RECLAIM is set. */
    - bio = bio_alloc(inode->i_sb->s_bdev, 0, REQ_OP_WRITE, 0, nr_pages,
    + bio = bio_new(inode->i_sb->s_bdev, 0, REQ_OP_WRITE, 0, nr_pages,
    GFP_NOFS);

    do {
    diff --git a/fs/direct-io.c b/fs/direct-io.c
    index aa1083ecd623..6aab1bd167bc 100644
    --- a/fs/direct-io.c
    +++ b/fs/direct-io.c
    @@ -397,11 +397,9 @@ dio_bio_alloc(struct dio *dio, struct dio_submit *sdio,
    * bio_alloc() is guaranteed to return a bio when allowed to sleep and
    * we request a valid number of vectors.
    */
    - bio = bio_alloc(GFP_KERNEL, nr_vecs);
    + bio = bio_new(bdev, first_sector, dio->op, dio->op_flags, nr_vecs,
    + GFP_KERNEL);

    - bio_set_dev(bio, bdev);
    - bio->bi_iter.bi_sector = first_sector;
    - bio_set_op_attrs(bio, dio->op, dio->op_flags);
    if (dio->is_async)
    bio->bi_end_io = dio_bio_end_aio;
    else
    --
    2.22.1
    \
     
     \ /
      Last update: 2021-01-28 08:41    [W:5.050 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site