Merge remote-tracking branch 'ceph/master'

Conflicts:
	drivers/block/rbd.c

diff --cc drivers/block/rbd.c
index 247bf3099731ea22ac28824367a03d7c61eeb77a,f24e241bb44f849a786746a5b95a718054aebdfe..d79831af5339d2ba1e07c66b6e40f1d12d69cdc5
--- 1/drivers/block/rbd.c
--- 2/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 = {

diff --cc fs/ceph/file.c
Simple merge