From 8be2725561cd8c5f0cccd45abc1b3f2bb7a0e5a9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 20 Aug 2019 14:26:22 -0700 Subject: [PATCH] 4.4-stable patches added patches: ib-mlx5-make-coding-style-more-consistent.patch --- ...x5-make-coding-style-more-consistent.patch | 52 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 53 insertions(+) create mode 100644 queue-4.4/ib-mlx5-make-coding-style-more-consistent.patch diff --git a/queue-4.4/ib-mlx5-make-coding-style-more-consistent.patch b/queue-4.4/ib-mlx5-make-coding-style-more-consistent.patch new file mode 100644 index 00000000000..0865fdbd4da --- /dev/null +++ b/queue-4.4/ib-mlx5-make-coding-style-more-consistent.patch @@ -0,0 +1,52 @@ +From 0025b0bdeae7c13b8ab1dce64b0108ed9c071e2e Mon Sep 17 00:00:00 2001 +From: Doug Ledford +Date: Thu, 3 Mar 2016 11:23:37 -0500 +Subject: IB/mlx5: Make coding style more consistent + +From: Doug Ledford + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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); + diff --git a/queue-4.4/series b/queue-4.4/series index 6f4cfad6fe6..bca43ae1475 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -68,3 +68,4 @@ input-psmouse-fix-build-error-of-multiple-definition.patch asm-generic-default-bug_on-x-to-if-x-bug.patch scsi-fcoe-embed-fc_rport_priv-in-fcoe_rport-structure.patch rdma-directly-cast-the-sockaddr-union-to-sockaddr.patch +ib-mlx5-make-coding-style-more-consistent.patch -- 2.47.3