Hi Sage,
Today's linux-next merge of the ceph tree got a conflict in
drivers/block/rbd.c between commit db2a144bedd5
("block_device_operations->release() should return void") from Linus'
tree and commit 87f11b7221f7 ("rbd: don't hold ctl_mutex to get/put
device") from the ceph tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). BTW, Sage, there is no Signed-off-by for you in the ceph tree commit (and several others - even though you committed them). -- Cheers, Stephen Rothwell [email protected] diff --cc drivers/block/rbd.c index 3063452,f24e241..0000000 --- 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 = {
pgpwBYscHSLOU.pgp
Description: PGP signature
