From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Dec 2016 20:18:42 +0000 (-0800)
Subject: rdma: fix buggy code that the compiler warns about
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d3ea547853852481dc5eba6d4cb13adab1564d0b;p=linux-beck.git

rdma: fix buggy code that the compiler warns about

Get rid of this warning:

  drivers/infiniband/sw/rdmavt/cq.c: In function ‘rvt_cq_exit’:
  drivers/infiniband/sw/rdmavt/cq.c:542:2: warning: ‘worker’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    kthread_destroy_worker(worker);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

by fixing the function to actually work.

Fixes: 6efaf10f163d ("IB/rdmavt: Avoid queuing work into a destroyed cq kthread worker")
Cc: Petr Mladek <pmladek@suse.com>
Cc: Doug Ledford <dledford@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/infiniband/sw/rdmavt/cq.c b/drivers/infiniband/sw/rdmavt/cq.c
index 4d0b6992e847..7aa7a4e312f1 100644
--- a/drivers/infiniband/sw/rdmavt/cq.c
+++ b/drivers/infiniband/sw/rdmavt/cq.c
@@ -532,7 +532,8 @@ void rvt_cq_exit(struct rvt_dev_info *rdi)
 
 	/* block future queuing from send_complete() */
 	spin_lock_irq(&rdi->n_cqs_lock);
-	if (!rdi->worker) {
+	worker = rdi->worker;
+	if (!worker) {
 		spin_unlock_irq(&rdi->n_cqs_lock);
 		return;
 	}