From: Michal Belczyk <belczyk@bsd.krakow.pl>
Date: Wed, 3 Jul 2013 22:09:03 +0000 (-0700)
Subject: nbd: remove bogus BUG_ON in NBD_CLEAR_QUE
X-Git-Tag: v3.11-rc1~99^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9532f149ee4532b5efc7e4a76381e1742805e1af;p=thirdparty%2Flinux.git

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>
---

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 46b35f7acfdeb..7ed1308c42d32 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: