This is a note to let you know that I've just added the patch titled
IB/qib: add missing braces in do_qib_user_sdma_queue_create()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ib-qib-add-missing-braces-in-do_qib_user_sdma_queue_create.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 37a967651caf99dd267017023737bd442f5acb3d Mon Sep 17 00:00:00 2001
From: Yann Droneaud <ydroneaud@xxxxxxxxxx>
Date: Mon, 10 Mar 2014 23:06:28 +0100
Subject: IB/qib: add missing braces in do_qib_user_sdma_queue_create()
From: Yann Droneaud <ydroneaud@xxxxxxxxxx>
commit 37a967651caf99dd267017023737bd442f5acb3d upstream.
Commit c804f07248895ff9c moved qib_assign_ctxt() to
do_qib_user_sdma_queue_create() but dropped the braces
around the statements.
This was spotted by coccicheck (coccinelle/spatch):
$ make C=2 CHECK=scripts/coccicheck drivers/infiniband/hw/qib/
CHECK drivers/infiniband/hw/qib/qib_file_ops.c
drivers/infiniband/hw/qib/qib_file_ops.c:1583:2-23: code aligned with following code on line 1587
This patch adds braces back.
Link: http://marc.info/?i=cover.1394485254.git.ydroneaud@xxxxxxxxxx
Cc: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
Cc: infinipath@xxxxxxxxx
Cc: Julia Lawall <julia.lawall@xxxxxxx>
Cc: cocci@xxxxxxxxxxxxxxx
Signed-off-by: Yann Droneaud <ydroneaud@xxxxxxxxxx>
Tested-by: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
Acked-by: Mike Marciniszyn <mike.marciniszyn@xxxxxxxxx>
Signed-off-by: Roland Dreier <roland@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/infiniband/hw/qib/qib_file_ops.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1578,7 +1578,7 @@ static int do_qib_user_sdma_queue_create
struct qib_ctxtdata *rcd = fd->rcd;
struct qib_devdata *dd = rcd->dd;
- if (dd->flags & QIB_HAS_SEND_DMA)
+ if (dd->flags & QIB_HAS_SEND_DMA) {
fd->pq = qib_user_sdma_queue_create(&dd->pcidev->dev,
dd->unit,
@@ -1586,6 +1586,7 @@ static int do_qib_user_sdma_queue_create
fd->subctxt);
if (!fd->pq)
return -ENOMEM;
+ }
return 0;
}
Patches currently in stable-queue which might be from ydroneaud@xxxxxxxxxx are
queue-3.14/ib-nes-return-an-error-on-ib_copy_from_udata-failure-instead-of-null.patch
queue-3.14/ib-qib-add-missing-braces-in-do_qib_user_sdma_queue_create.patch
queue-3.14/ib-mthca-return-an-error-on-ib_copy_to_udata-failure.patch
queue-3.14/ib-ehca-returns-an-error-on-ib_copy_to_udata-failure.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html