From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 01:22:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'ceph/master'
X-Git-Tag: next-20130619~100
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08de0b8e1ec9d8f64f55bca81e65812a1ac07d41;p=karo-tx-linux.git

Merge remote-tracking branch 'ceph/master'

Conflicts:
	drivers/block/rbd.c
---

08de0b8e1ec9d8f64f55bca81e65812a1ac07d41
diff --cc drivers/block/rbd.c
index 3063452e55da,f24e241bb44f..d79831af5339
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@@ -507,9 -505,9 +505,7 @@@ static void rbd_release(struct gendisk 
  	spin_unlock_irq(&rbd_dev->lock);
  	rbd_assert(open_count_before > 0);
  
- 	mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING);
  	put_device(&rbd_dev->dev);
- 	mutex_unlock(&ctl_mutex);
 -
 -	return 0;
  }
  
  static const struct block_device_operations rbd_bd_ops = {