summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Belczyk <belczyk@bsd.krakow.pl>2013-07-03 15:09:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:08:05 -0700
commit9532f149ee4532b5efc7e4a76381e1742805e1af (patch)
tree3f9b0ca5513e522761a3bfa47c10dd8ad6bd4793
parent8f75af44eed0c81f818b5b345023cebfe5209400 (diff)
downloadop-kernel-dev-9532f149ee4532b5efc7e4a76381e1742805e1af.zip
op-kernel-dev-9532f149ee4532b5efc7e4a76381e1742805e1af.tar.gz
nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
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 <belczyk@bsd.krakow.pl> Signed-off-by: Paul Clements <paul.clements@steeleye.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/nbd.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 46b35f7..7ed1308 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -751,7 +751,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:
OpenPOWER on IntegriCloud