lkml.org 
[lkml]   [2012]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 07/12] block: Rename bio_split() -> bio_pair_split()
    Date
    This is prep work for introducing a more general bio_split()

    Signed-off-by: Kent Overstreet <koverstreet@google.com>
    ---
    drivers/block/drbd/drbd_req.c | 2 +-
    drivers/block/pktcdvd.c | 2 +-
    drivers/block/rbd.c | 3 ++-
    drivers/md/linear.c | 2 +-
    drivers/md/raid0.c | 6 +++---
    drivers/md/raid10.c | 4 ++--
    fs/bio.c | 4 ++--
    include/linux/bio.h | 2 +-
    8 files changed, 13 insertions(+), 12 deletions(-)

    diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
    index 8e93a6a..b5cfa3b 100644
    --- a/drivers/block/drbd/drbd_req.c
    +++ b/drivers/block/drbd/drbd_req.c
    @@ -1150,7 +1150,7 @@ void drbd_make_request(struct request_queue *q, struct bio *bio)
    const int sps = 1 << HT_SHIFT; /* sectors per slot */
    const int mask = sps - 1;
    const sector_t first_sectors = sps - (sect & mask);
    - bp = bio_split(bio, first_sectors);
    + bp = bio_pair_split(bio, first_sectors);

    /* we need to get a "reference count" (ap_bio_cnt)
    * to avoid races with the disconnect/reconnect/suspend code.
    diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
    index ae55f08..18393a1 100644
    --- a/drivers/block/pktcdvd.c
    +++ b/drivers/block/pktcdvd.c
    @@ -2469,7 +2469,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)
    if (last_zone != zone) {
    BUG_ON(last_zone != zone + pd->settings.size);
    first_sectors = last_zone - bio->bi_sector;
    - bp = bio_split(bio, first_sectors);
    + bp = bio_pair_split(bio, first_sectors);
    BUG_ON(!bp);
    pkt_make_request(q, &bp->bio1);
    pkt_make_request(q, &bp->bio2);
    diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
    index 8f428a8..e33c224 100644
    --- a/drivers/block/rbd.c
    +++ b/drivers/block/rbd.c
    @@ -732,7 +732,8 @@ static struct bio *bio_chain_clone(struct bio **old, struct bio **next,

    /* split the bio. We'll release it either in the next
    call, or it will have to be released outside */
    - bp = bio_split(old_chain, (len - total) / SECTOR_SIZE);
    + bp = bio_pair_split(old_chain,
    + (len - total) / SECTOR_SIZE);
    if (!bp)
    goto err_out;

    diff --git a/drivers/md/linear.c b/drivers/md/linear.c
    index fa211d8..e860cb9 100644
    --- a/drivers/md/linear.c
    +++ b/drivers/md/linear.c
    @@ -314,7 +314,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)

    rcu_read_unlock();

    - bp = bio_split(bio, end_sector - bio->bi_sector);
    + bp = bio_pair_split(bio, end_sector - bio->bi_sector);

    linear_make_request(mddev, &bp->bio1);
    linear_make_request(mddev, &bp->bio2);
    diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
    index de63a1f..c89c8aa 100644
    --- a/drivers/md/raid0.c
    +++ b/drivers/md/raid0.c
    @@ -516,11 +516,11 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
    * refuse to split for us, so we need to split it.
    */
    if (likely(is_power_of_2(chunk_sects)))
    - bp = bio_split(bio, chunk_sects - (sector &
    + bp = bio_pair_split(bio, chunk_sects - (sector &
    (chunk_sects-1)));
    else
    - bp = bio_split(bio, chunk_sects -
    - sector_div(sector, chunk_sects));
    + bp = bio_pair_split(bio, chunk_sects -
    + sector_div(sector, chunk_sects));
    raid0_make_request(mddev, &bp->bio1);
    raid0_make_request(mddev, &bp->bio2);
    bio_pair_release(bp);
    diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
    index 8da6282..be75924 100644
    --- a/drivers/md/raid10.c
    +++ b/drivers/md/raid10.c
    @@ -1063,8 +1063,8 @@ static void make_request(struct mddev *mddev, struct bio * bio)
    /* This is a one page bio that upper layers
    * refuse to split for us, so we need to split it.
    */
    - bp = bio_split(bio,
    - chunk_sects - (bio->bi_sector & (chunk_sects - 1)) );
    + bp = bio_pair_split(bio,
    + chunk_sects - (bio->bi_sector & (chunk_sects - 1)) );

    /* Each of these 'make_request' calls will call 'wait_barrier'.
    * If the first succeeds but the second blocks due to the resync
    diff --git a/fs/bio.c b/fs/bio.c
    index ff34311..0470376 100644
    --- a/fs/bio.c
    +++ b/fs/bio.c
    @@ -1491,7 +1491,7 @@ static void bio_pair_end_2(struct bio *bi, int err)
    /*
    * split a bio - only worry about a bio with a single page in its iovec
    */
    -struct bio_pair *bio_split(struct bio *bi, int first_sectors)
    +struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors)
    {
    struct bio_pair *bp = mempool_alloc(bio_split_pool, GFP_NOIO);

    @@ -1534,7 +1534,7 @@ struct bio_pair *bio_split(struct bio *bi, int first_sectors)

    return bp;
    }
    -EXPORT_SYMBOL(bio_split);
    +EXPORT_SYMBOL(bio_pair_split);

    /**
    * bio_sector_offset - Find hardware sector offset in bio
    diff --git a/include/linux/bio.h b/include/linux/bio.h
    index 484b96e..fdcc8dc 100644
    --- a/include/linux/bio.h
    +++ b/include/linux/bio.h
    @@ -201,7 +201,7 @@ struct bio_pair {
    atomic_t cnt;
    int error;
    };
    -extern struct bio_pair *bio_split(struct bio *bi, int first_sectors);
    +extern struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors);
    extern void bio_pair_release(struct bio_pair *dbio);

    extern struct bio_set *bioset_create(unsigned int, unsigned int);
    --
    1.7.7.3


    \
     
     \ /
      Last update: 2012-08-07 00:41    [W:0.031 / U:1.268 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site