lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 096/102] Fix slab name "biovec-(1<<(21-12))"
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Mikulas Patocka <mpatocka@redhat.com>

    commit bd5c4facf59648581d2f1692dad7b107bf429954 upstream.

    I'm getting a slab named "biovec-(1<<(21-12))". It is caused by unintended
    expansion of the macro BIO_MAX_PAGES. This patch renames it to biovec-max.

    Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
    Cc: stable@vger.kernel.org # v4.14+
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    block/bio.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/block/bio.c
    +++ b/block/bio.c
    @@ -42,9 +42,9 @@
    * break badly! cannot be bigger than what you can fit into an
    * unsigned short
    */
    -#define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) }
    +#define BV(x, n) { .nr_vecs = x, .name = "biovec-"#n }
    static struct biovec_slab bvec_slabs[BVEC_POOL_NR] __read_mostly = {
    - BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES),
    + BV(1, 1), BV(4, 4), BV(16, 16), BV(64, 64), BV(128, 128), BV(BIO_MAX_PAGES, max),
    };
    #undef BV


    \
     
     \ /
      Last update: 2018-04-06 15:37    [W:2.563 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site