From 25eb376c5f028779bc6bbfa8ef1c448a068d88bf Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Thu, 10 Feb 2011 15:01:28 -0800 Subject: [PATCH] --- yaml --- r: 233141 b: refs/heads/master c: de1f016f882e52facc3c8609599f827bcdd14af9 h: refs/heads/master i: 233139: ba7a381a3c7ce7c639a62ef037664d897b0c6ddf v: v3 --- [refs] | 2 +- trunk/drivers/block/nbd.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 41becfa1ce5d..ed2091b69c26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24a6f5b8589d2abfbf523c59ab1258726edc164f +refs/heads/master: de1f016f882e52facc3c8609599f827bcdd14af9 diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c index a32fb41246f8..e6fc716aca45 100644 --- a/trunk/drivers/block/nbd.c +++ b/trunk/drivers/block/nbd.c @@ -53,7 +53,6 @@ #define DBG_BLKDEV 0x0100 #define DBG_RX 0x0200 #define DBG_TX 0x0400 -static DEFINE_MUTEX(nbd_mutex); static unsigned int debugflags; #endif /* NDEBUG */ @@ -718,11 +717,9 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode, dprintk(DBG_IOCTL, "%s: nbd_ioctl cmd=%s(0x%x) arg=%lu\n", lo->disk->disk_name, ioctl_cmd_to_ascii(cmd), cmd, arg); - mutex_lock(&nbd_mutex); mutex_lock(&lo->tx_lock); error = __nbd_ioctl(bdev, lo, cmd, arg); mutex_unlock(&lo->tx_lock); - mutex_unlock(&nbd_mutex); return error; }