linux-kernel - linux-next: manual merge of the ceph tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130619112207.e7c50605c8f93bce4ccdcae0@canb.auug.org.au>
Date:	Wed, 19 Jun 2013 11:22:07 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Sage Weil <sage@...dream.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alex Elder <elder@...tank.com>,
	Al Viro <viro@...iv.linux.org.uk>
Subject: linux-next: manual merge of the ceph tree with Linus' tree

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                    sfr@...b.auug.org.au

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

Content of type "application/pgp-signature" skipped