lkml.org 
[lkml]   [2019]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 70/78] IB/mlx5: Make coding style more consistent
    Date
    From: Doug Ledford <dledford@redhat.com>

    commit 0025b0bdeae7c13b8ab1dce64b0108ed9c071e2e upstream.

    These three related functions can't agree whether to put the
    umrwr on the stack dirty and then memset it, or to initialize
    it on the stack. Make them all agree.

    Signed-off-by: Doug Ledford <dledford@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/infiniband/hw/mlx5/mr.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/infiniband/hw/mlx5/mr.c
    +++ b/drivers/infiniband/hw/mlx5/mr.c
    @@ -792,7 +792,7 @@ static struct mlx5_ib_mr *reg_umr(struct
    struct device *ddev = dev->ib_dev.dma_device;
    struct umr_common *umrc = &dev->umrc;
    struct mlx5_ib_umr_context umr_context;
    - struct mlx5_umr_wr umrwr;
    + struct mlx5_umr_wr umrwr = {};
    struct ib_send_wr *bad;
    struct mlx5_ib_mr *mr;
    struct ib_sge sg;
    @@ -839,7 +839,6 @@ static struct mlx5_ib_mr *reg_umr(struct
    goto free_pas;
    }

    - memset(&umrwr, 0, sizeof(umrwr));
    umrwr.wr.wr_id = (u64)(unsigned long)&umr_context;
    prep_umr_reg_wqe(pd, &umrwr.wr, &sg, dma, npages, mr->mmr.key,
    page_shift, virt_addr, len, access_flags);
    @@ -1163,11 +1162,10 @@ static int unreg_umr(struct mlx5_ib_dev
    {
    struct umr_common *umrc = &dev->umrc;
    struct mlx5_ib_umr_context umr_context;
    - struct mlx5_umr_wr umrwr;
    + struct mlx5_umr_wr umrwr = {};
    struct ib_send_wr *bad;
    int err;

    - memset(&umrwr.wr, 0, sizeof(umrwr));
    umrwr.wr.wr_id = (u64)(unsigned long)&umr_context;
    prep_umr_unreg_wqe(dev, &umrwr.wr, mr->mmr.key);


    \
     
     \ /
      Last update: 2019-08-22 19:56    [W:3.665 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site