From: Denis Cheng <crquan@gmail.com>
Date: Wed, 17 Oct 2007 06:26:14 +0000 (-0700)
Subject: nbd: use list_for_each_entry_safe to make it more consolidated and readable
X-Git-Tag: v2.6.24-rc1~764
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c9740b499f959ed513375b6e35c2ab161921cb;p=linux-2.6

nbd: use list_for_each_entry_safe to make it more consolidated and readable

Thus the traverse of the loop may delete nodes, use the safe version.

Signed-off-by: Denis Cheng <crquan@gmail.com>
Cc: Paul Clements <paul.clements@steeleye.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 be5ec3a9b1..d7a4215799 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -233,8 +233,7 @@ error_out:
 
 static struct request *nbd_find_request(struct nbd_device *lo, char *handle)
 {
-	struct request *req;
-	struct list_head *tmp;
+	struct request *req, *tmp;
 	struct request *xreq;
 	int err;
 
@@ -245,8 +244,7 @@ static struct request *nbd_find_request(struct nbd_device *lo, char *handle)
 		goto out;
 
 	spin_lock(&lo->queue_lock);
-	list_for_each(tmp, &lo->queue_head) {
-		req = list_entry(tmp, struct request, queuelist);
+	list_for_each_entry_safe(req, tmp, &lo->queue_head, queuelist) {
 		if (req != xreq)
 			continue;
 		list_del_init(&req->queuelist);