lkml.org 
[lkml]   [2014]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 65/82] block: Fix nr_vecs for inline integrity vectors
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

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

    From: "Martin K. Petersen" <martin.petersen@oracle.com>

    commit 087787959ce851d7bbb19f10f6e9241b7f85a3ca upstream.

    Commit 9f060e2231ca changed the way we handle allocations for the
    integrity vectors. When the vectors are inline there is no associated
    slab and consequently bvec_nr_vecs() returns 0. Ensure that we check
    against BIP_INLINE_VECS in that case.

    Reported-by: David Milburn <dmilburn@redhat.com>
    Tested-by: David Milburn <dmilburn@redhat.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <axboe@fb.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/bio-integrity.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/fs/bio-integrity.c
    +++ b/fs/bio-integrity.c
    @@ -114,6 +114,14 @@ void bio_integrity_free(struct bio *bio)
    }
    EXPORT_SYMBOL(bio_integrity_free);

    +static inline unsigned int bip_integrity_vecs(struct bio_integrity_payload *bip)
    +{
    + if (bip->bip_slab == BIO_POOL_NONE)
    + return BIP_INLINE_VECS;
    +
    + return bvec_nr_vecs(bip->bip_slab);
    +}
    +
    /**
    * bio_integrity_add_page - Attach integrity metadata
    * @bio: bio to update
    @@ -129,7 +137,7 @@ int bio_integrity_add_page(struct bio *b
    struct bio_integrity_payload *bip = bio->bi_integrity;
    struct bio_vec *iv;

    - if (bip->bip_vcnt >= bvec_nr_vecs(bip->bip_slab)) {
    + if (bip->bip_vcnt >= bip_integrity_vecs(bip)) {
    printk(KERN_ERR "%s: bip_vec full\n", __func__);
    return 0;
    }



    \
     
     \ /
      Last update: 2014-02-21 02:41    [W:4.485 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site