summaryrefslogtreecommitdiffstats
path: root/drivers/block/nbd.c
diff options
context:
space:
mode:
authorDenis Cheng <crquan@gmail.com>2007-10-16 23:26:14 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 08:42:47 -0700
commitd2c9740b499f959ed513375b6e35c2ab161921cb (patch)
treea7add684a7cf1dcfd5ff8d3ce60e071fca55cf80 /drivers/block/nbd.c
parent04fc8bbcf5eb25fa2aec290b302a9878dde20168 (diff)
downloadop-kernel-dev-d2c9740b499f959ed513375b6e35c2ab161921cb.zip
op-kernel-dev-d2c9740b499f959ed513375b6e35c2ab161921cb.tar.gz
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>
Diffstat (limited to 'drivers/block/nbd.c')
-rw-r--r--drivers/block/nbd.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index be5ec3a..d7a4215 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);
OpenPOWER on IntegriCloud