From: Alex Elder <elder@inktank.com>
Date: Thu, 28 Feb 2013 01:05:28 +0000 (-0800)
Subject: nbd: fix sparse warning
X-Git-Tag: v3.9-rc1~46^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=398eb08555b24049e0362fee92920982b283fd96;p=~emulex%2Finfiniband.git

nbd: fix sparse warning

I just fixed this in "drivers/block/rbd.c" and I noticed that
"drivers/block/nbd.c" has the same problem.  Fix a warning issued by
sparse by adding some lockdep annotations to indicate the queue lock gets
dropped (because it's held when do_nbd_request() is called) and
re-acquired within the function.

Signed-off-by: Alex Elder <elder@inktank.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Cc: Paul Clements <paul.clements@us.sios.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 52003d7a69a..7fecc784be0 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -564,6 +564,7 @@ static int nbd_thread(void *data)
  */
 
 static void do_nbd_request(struct request_queue *q)
+		__releases(q->queue_lock) __acquires(q->queue_lock)
 {
 	struct request *req;