Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2c9740b authored by Denis Cheng's avatar Denis Cheng Committed by Linus Torvalds
Browse files

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: default avatarDenis Cheng <crquan@gmail.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 04fc8bbc

drivers/block/nbd.c

+2 −4
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ static int nbd_send_req(struct nbd_device *lo, struct request *req) 


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);