lkml.org 
[lkml]   [2008]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 11/42] bio: fix __bio_copy_iov() handling of bio->bv_len
    2.6.26-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

    commit aefcc28a3a63ac33a298777aa50ba43641c75241 upstream

    The commit c5dec1c3034f1ae3503efbf641ff3b0273b64797 introduced
    __bio_copy_iov() to add bounce support to blk_rq_map_user_iov.

    __bio_copy_iov() uses bio->bv_len to copy data for READ commands after
    the completion but it doesn't work with a request that partially
    completed. SCSI always completes a PC request as a whole but seems
    some don't.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/bio.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/fs/bio.c
    +++ b/fs/bio.c
    @@ -486,8 +486,8 @@ static struct bio_map_data *bio_alloc_ma
    return NULL;
    }

    -static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count,
    - int uncopy)
    +static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs,
    + struct sg_iovec *iov, int iov_count, int uncopy)
    {
    int ret = 0, i;
    struct bio_vec *bvec;
    @@ -497,7 +497,7 @@ static int __bio_copy_iov(struct bio *bi

    __bio_for_each_segment(bvec, bio, i, 0) {
    char *bv_addr = page_address(bvec->bv_page);
    - unsigned int bv_len = bvec->bv_len;
    + unsigned int bv_len = iovecs[i].bv_len;

    while (bv_len && iov_idx < iov_count) {
    unsigned int bytes;
    @@ -549,7 +549,7 @@ int bio_uncopy_user(struct bio *bio)
    struct bio_map_data *bmd = bio->bi_private;
    int ret;

    - ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1);
    + ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1);

    bio_free_map_data(bmd);
    bio_put(bio);
    @@ -628,7 +628,7 @@ struct bio *bio_copy_user_iov(struct req
    * success
    */
    if (!write_to_vm) {
    - ret = __bio_copy_iov(bio, iov, iov_count, 0);
    + ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0);
    if (ret)
    goto cleanup;
    }
    --


    \
     
     \ /
      Last update: 2008-09-03 19:39    [W:0.022 / U:62.564 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site