Skip to content

Commit

Permalink
nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Belczyk authored and Linus Torvalds committed Jul 3, 2013
1 parent 8f75af4 commit 9532f14
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/block/nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 9532f14

Please sign in to comment.