From: Denis Cheng Thus the traverse of the loop may delete nodes, use the safe version. Signed-off-by: Denis Cheng Cc: Paul Clements Signed-off-by: Andrew Morton --- drivers/block/nbd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/block/nbd.c~nbd-use-list_for_each_entry_safe-to-make-it-more-consolidated-and-readable drivers/block/nbd.c --- a/drivers/block/nbd.c~nbd-use-list_for_each_entry_safe-to-make-it-more-consolidated-and-readable +++ a/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( 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); _