2013-06-18 21:24:32

by Paul Clements

[permalink] [raw]
Subject: [PATCH] nbd: remove bogus BUG_ON in NBD_CLEAR_QUE

From: Michal Belczyk <[email protected]>

The NBD_CLEAR_QUE ioctl has been deprecated for quite some time (its job
is now done by two other ioctls). We should stop trying to make bogus
assertions in it. Also, user-level code should remove calls to
NBD_CLEAR_QUE, ASAP.

Signed-off-by: Michal Belczyk <[email protected]>
Signed-off-by: Paul Clements <[email protected]>
---

nbd.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7fecc78..21ba264 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -750,7 +750,6 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd,
* This is for compatibility only. The queue is always cleared
* by NBD_DO_IT or NBD_CLEAR_SOCK.
*/
- BUG_ON(!nbd->sock && !list_empty(&nbd->queue_head));
return 0;

case NBD_PRINT_DEBUG: