linux-kernel - linux-next: manual merge of the md tree with the device-mapper 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: <20120315140730.760e0eb9842d0cccb834b95b@canb.auug.org.au>
Date:	Thu, 15 Mar 2012 14:07:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Neil Brown <neilb@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonathan E Brassow <jbrassow@...hat.com>,
	Alasdair G Kergon <agk@...hat.com>
Subject: linux-next: manual merge of the md tree with the device-mapper tree

Hi Neil,

Today's linux-next merge of the md tree got a conflict in
drivers/md/dm-raid.c between commit 43390ddd7f36 ("The dm-raid code
currently fails to create a RAID array if any of the") from the
device-mapper tree and commit 760e35d7e573 ("md: tidy up rdev_for_each
usage") from the md tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/md/dm-raid.c
index f03e423,c5a875d..0000000
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@@ -857,27 -855,11 +857,27 @@@ static int super_validate(struct mddev 
  static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs)
  {
  	int ret;
 +	unsigned redundancy = 0;
 +	struct raid_dev *dev;
- 	struct md_rdev *rdev, *freshest, *tmp;
+ 	struct md_rdev *rdev, *freshest;
  	struct mddev *mddev = &rs->md;
  
 +	switch (rs->raid_type->level) {
 +	case 1:
 +		redundancy = rs->md.raid_disks - 1;
 +		break;
 +	case 4:
 +	case 5:
 +	case 6:
 +		redundancy = rs->raid_type->parity_devs;
 +		break;
 +	default:
 +		ti->error = "Unknown RAID type";
 +		return -EINVAL;
 +	}
 +
  	freshest = NULL;
- 	rdev_for_each(rdev, tmp, mddev) {
+ 	rdev_for_each(rdev, mddev) {
  		if (!rdev->meta_bdev)
  			continue;
  

Content of type "application/pgp-signature" skipped