diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 10:46:32 (GMT) |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 10:46:32 (GMT) |
commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /drivers/block/nbd.c | |
parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
download | linux-fsl-qoriq-102084d3d3969646cc89ea159e50898aeafc6649.tar.xz |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'drivers/block/nbd.c')
-rw-r--r-- | drivers/block/nbd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index d07c9f7..0c03411 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -449,6 +449,14 @@ static void nbd_clear_que(struct nbd_device *nbd) req->errors++; nbd_end_request(req); } + + while (!list_empty(&nbd->waiting_queue)) { + req = list_entry(nbd->waiting_queue.next, struct request, + queuelist); + list_del_init(&req->queuelist); + req->errors++; + nbd_end_request(req); + } } @@ -598,6 +606,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, nbd->file = NULL; nbd_clear_que(nbd); BUG_ON(!list_empty(&nbd->queue_head)); + BUG_ON(!list_empty(&nbd->waiting_queue)); if (file) fput(file); return 0; |