From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Neil Brown <neilb@suse.de>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jonathan E Brassow <jbrassow@redhat.com>,
Alasdair G Kergon <agk@redhat.com>
Subject: linux-next: manual merge of the md tree with the device-mapper tree
Date: Thu, 15 Mar 2012 14:07:30 +1100 [thread overview]
Message-ID: <20120315140730.760e0eb9842d0cccb834b95b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1345 bytes --]
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@canb.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;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-15 3:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 3:07 Stephen Rothwell [this message]
2017-03-28 1:43 linux-next: manual merge of the md tree with the device-mapper tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120315140730.760e0eb9842d0cccb834b95b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agk@redhat.com \
--cc=jbrassow@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).