diff for duplicates of <bc2e618f-9bfe-25bb-af16-e915605fc112@users.sourceforge.net> diff --git a/a/1.txt b/N1/1.txt index 88e74ed..8a3f819 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -From: Markus Elfring <elfring@users.sourceforge.net> +From: Markus Elfring <elfring-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> Date: Sat, 22 Apr 2017 11:41:55 +0200 * Multiplications for the size determination of memory allocations @@ -11,7 +11,7 @@ Date: Sat, 22 Apr 2017 11:41:55 +0200 to make the corresponding size determinations a bit safer according to the Linux coding style convention. -Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> +Signed-off-by: Markus Elfring <elfring-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org> --- v2: @@ -62,7 +62,7 @@ index 57c9a2ad0260..91705b10f269 100644 - dev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL); + dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr), + GFP_KERNEL); - if (dev->stag_arr = NULL) + if (dev->stag_arr == NULL) goto alloc_err; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -85,29 +85,36 @@ index c52edeafd616..146601c97158 100644 static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp) { -- qp->wqe_wr_id_tbl - kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt, +- qp->wqe_wr_id_tbl = +- kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt, - GFP_KERNEL); + qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl), + GFP_KERNEL); - if (qp->wqe_wr_id_tbl = NULL) + if (qp->wqe_wr_id_tbl == NULL) return -ENOMEM; -- qp->rqe_wr_id_tbl - kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL); +- qp->rqe_wr_id_tbl = +- kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL); + qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl), + GFP_KERNEL); - if (qp->rqe_wr_id_tbl = NULL) + if (qp->rqe_wr_id_tbl == NULL) return -ENOMEM; @@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd, goto err; - if (udata = NULL) { + if (udata == NULL) { - srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt, - GFP_KERNEL); + srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt, + sizeof(*srq->rqe_wr_id_tbl), + GFP_KERNEL); - if (srq->rqe_wr_id_tbl = NULL) + if (srq->rqe_wr_id_tbl == NULL) goto arm_err; -- 2.12.2 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-rdma" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 9c44bd8..001a077 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,9 +2,9 @@ "ref\01492720999.3041.18.camel@redhat.com\0" "ref\086425035-7da8-d2b1-8544-d4f7540d50c6@users.sourceforge.net\0" "ref\086425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org\0" - "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" + "From\0SF Markus Elfring <elfring-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>\0" "Subject\0[PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions\0" - "Date\0Sat, 22 Apr 2017 14:33:00 +0000\0" + "Date\0Sat, 22 Apr 2017 16:33:00 +0200\0" "To\0Devesh Sharma <devesh.sharma-1wcpHE2jlwO1Z/+hSey0Gg@public.gmane.org>" Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @@ -16,7 +16,7 @@ " kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" - "From: Markus Elfring <elfring@users.sourceforge.net>\n" + "From: Markus Elfring <elfring-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>\n" "Date: Sat, 22 Apr 2017 11:41:55 +0200\n" "\n" "* Multiplications for the size determination of memory allocations\n" @@ -29,7 +29,7 @@ " to make the corresponding size determinations a bit safer according to\n" " the Linux coding style convention.\n" "\n" - "Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>\n" + "Signed-off-by: Markus Elfring <elfring-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>\n" "---\n" "\n" "v2:\n" @@ -80,7 +80,7 @@ "-\tdev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL);\n" "+\tdev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),\n" "+\t\t\t\tGFP_KERNEL);\n" - " \tif (dev->stag_arr = NULL)\n" + " \tif (dev->stag_arr == NULL)\n" " \t\tgoto alloc_err;\n" " \n" "diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c\n" @@ -103,31 +103,38 @@ " \n" " static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)\n" " {\n" - "-\tqp->wqe_wr_id_tbl -\t kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,\n" + "-\tqp->wqe_wr_id_tbl =\n" + "-\t kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,\n" "-\t\t GFP_KERNEL);\n" "+\tqp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),\n" "+\t\t\t\t GFP_KERNEL);\n" - " \tif (qp->wqe_wr_id_tbl = NULL)\n" + " \tif (qp->wqe_wr_id_tbl == NULL)\n" " \t\treturn -ENOMEM;\n" - "-\tqp->rqe_wr_id_tbl -\t kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);\n" + "-\tqp->rqe_wr_id_tbl =\n" + "-\t kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);\n" "+\tqp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),\n" "+\t\t\t\t GFP_KERNEL);\n" - " \tif (qp->rqe_wr_id_tbl = NULL)\n" + " \tif (qp->rqe_wr_id_tbl == NULL)\n" " \t\treturn -ENOMEM;\n" " \n" "@@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,\n" " \t\tgoto err;\n" " \n" - " \tif (udata = NULL) {\n" + " \tif (udata == NULL) {\n" "-\t\tsrq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,\n" "-\t\t\t GFP_KERNEL);\n" "+\t\tsrq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,\n" "+\t\t\t\t\t sizeof(*srq->rqe_wr_id_tbl),\n" "+\t\t\t\t\t GFP_KERNEL);\n" - " \t\tif (srq->rqe_wr_id_tbl = NULL)\n" + " \t\tif (srq->rqe_wr_id_tbl == NULL)\n" " \t\t\tgoto arm_err;\n" " \n" "-- \n" - 2.12.2 + "2.12.2\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-rdma\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -a6b38130fab1db06964429c3e50c0b22cf808ff9de7e7c7d9eaea2f990f67495 +28a813c11b9ef7c2fc8e489c83bfc784e069ec49b1f88bce41e3f2ca32ae4edc
diff --git a/a/1.txt b/N2/1.txt index 88e74ed..3d0ed5e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -62,7 +62,7 @@ index 57c9a2ad0260..91705b10f269 100644 - dev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL); + dev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr), + GFP_KERNEL); - if (dev->stag_arr = NULL) + if (dev->stag_arr == NULL) goto alloc_err; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -85,28 +85,30 @@ index c52edeafd616..146601c97158 100644 static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp) { -- qp->wqe_wr_id_tbl - kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt, +- qp->wqe_wr_id_tbl = +- kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt, - GFP_KERNEL); + qp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl), + GFP_KERNEL); - if (qp->wqe_wr_id_tbl = NULL) + if (qp->wqe_wr_id_tbl == NULL) return -ENOMEM; -- qp->rqe_wr_id_tbl - kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL); +- qp->rqe_wr_id_tbl = +- kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL); + qp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl), + GFP_KERNEL); - if (qp->rqe_wr_id_tbl = NULL) + if (qp->rqe_wr_id_tbl == NULL) return -ENOMEM; @@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd, goto err; - if (udata = NULL) { + if (udata == NULL) { - srq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt, - GFP_KERNEL); + srq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt, + sizeof(*srq->rqe_wr_id_tbl), + GFP_KERNEL); - if (srq->rqe_wr_id_tbl = NULL) + if (srq->rqe_wr_id_tbl == NULL) goto arm_err; -- diff --git a/a/content_digest b/N2/content_digest index 9c44bd8..d1c075a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,18 @@ "ref\0fc421509-4069-da8a-b308-60b49ea91ada@users.sourceforge.net\0" "ref\01492720999.3041.18.camel@redhat.com\0" "ref\086425035-7da8-d2b1-8544-d4f7540d50c6@users.sourceforge.net\0" - "ref\086425035-7da8-d2b1-8544-d4f7540d50c6-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f@public.gmane.org\0" "From\0SF Markus Elfring <elfring@users.sourceforge.net>\0" "Subject\0[PATCH v2 02/12] IB/ocrdma: Use kcalloc() in five functions\0" - "Date\0Sat, 22 Apr 2017 14:33:00 +0000\0" - "To\0Devesh Sharma <devesh.sharma-1wcpHE2jlwO1Z/+hSey0Gg@public.gmane.org>" - Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Sean Hefty <sean.hefty-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> - Selvin Xavier <selvin.xavier-1wcpHE2jlwO1Z/+hSey0Gg@public.gmane.org> - Yuval Shaia <yuval.shaia-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> - " linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>" - " kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "Date\0Sat, 22 Apr 2017 16:33:00 +0200\0" + "To\0Devesh Sharma <devesh.sharma@avagotech.com>" + Doug Ledford <dledford@redhat.com> + Hal Rosenstock <hal.rosenstock@gmail.com> + Sean Hefty <sean.hefty@intel.com> + Selvin Xavier <selvin.xavier@avagotech.com> + Yuval Shaia <yuval.shaia@oracle.com> + " linux-rdma@vger.kernel.org\0" + "Cc\0LKML <linux-kernel@vger.kernel.org>" + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "From: Markus Elfring <elfring@users.sourceforge.net>\n" @@ -80,7 +79,7 @@ "-\tdev->stag_arr = kzalloc(sizeof(u64) * OCRDMA_MAX_STAG, GFP_KERNEL);\n" "+\tdev->stag_arr = kcalloc(OCRDMA_MAX_STAG, sizeof(*dev->stag_arr),\n" "+\t\t\t\tGFP_KERNEL);\n" - " \tif (dev->stag_arr = NULL)\n" + " \tif (dev->stag_arr == NULL)\n" " \t\tgoto alloc_err;\n" " \n" "diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c\n" @@ -103,31 +102,33 @@ " \n" " static int ocrdma_alloc_wr_id_tbl(struct ocrdma_qp *qp)\n" " {\n" - "-\tqp->wqe_wr_id_tbl -\t kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,\n" + "-\tqp->wqe_wr_id_tbl =\n" + "-\t kzalloc(sizeof(*(qp->wqe_wr_id_tbl)) * qp->sq.max_cnt,\n" "-\t\t GFP_KERNEL);\n" "+\tqp->wqe_wr_id_tbl = kcalloc(qp->sq.max_cnt, sizeof(*qp->wqe_wr_id_tbl),\n" "+\t\t\t\t GFP_KERNEL);\n" - " \tif (qp->wqe_wr_id_tbl = NULL)\n" + " \tif (qp->wqe_wr_id_tbl == NULL)\n" " \t\treturn -ENOMEM;\n" - "-\tqp->rqe_wr_id_tbl -\t kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);\n" + "-\tqp->rqe_wr_id_tbl =\n" + "-\t kzalloc(sizeof(u64) * qp->rq.max_cnt, GFP_KERNEL);\n" "+\tqp->rqe_wr_id_tbl = kcalloc(qp->rq.max_cnt, sizeof(*qp->rqe_wr_id_tbl),\n" "+\t\t\t\t GFP_KERNEL);\n" - " \tif (qp->rqe_wr_id_tbl = NULL)\n" + " \tif (qp->rqe_wr_id_tbl == NULL)\n" " \t\treturn -ENOMEM;\n" " \n" "@@ -1903,8 +1901,9 @@ struct ib_srq *ocrdma_create_srq(struct ib_pd *ibpd,\n" " \t\tgoto err;\n" " \n" - " \tif (udata = NULL) {\n" + " \tif (udata == NULL) {\n" "-\t\tsrq->rqe_wr_id_tbl = kzalloc(sizeof(u64) * srq->rq.max_cnt,\n" "-\t\t\t GFP_KERNEL);\n" "+\t\tsrq->rqe_wr_id_tbl = kcalloc(srq->rq.max_cnt,\n" "+\t\t\t\t\t sizeof(*srq->rqe_wr_id_tbl),\n" "+\t\t\t\t\t GFP_KERNEL);\n" - " \t\tif (srq->rqe_wr_id_tbl = NULL)\n" + " \t\tif (srq->rqe_wr_id_tbl == NULL)\n" " \t\t\tgoto arm_err;\n" " \n" "-- \n" 2.12.2 -a6b38130fab1db06964429c3e50c0b22cf808ff9de7e7c7d9eaea2f990f67495 +fdfcc3f6e4a2b19b6f6a9472ed5cc53b674c5ebac0a9c8580483b3141d84cf8a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.