Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200570
b: refs/heads/master
c: 049d6c1
h: refs/heads/master
v: v3
  • Loading branch information
Maciej Trela authored and NeilBrown committed Jun 24, 2010
1 parent 1d88c09 commit b219911
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 001048a318d48e93cb6a1246f3b20335b2a7c855
refs/heads/master: 049d6c1ef983c9ac43aa423dfd752071a5b0002d
8 changes: 6 additions & 2 deletions trunk/drivers/md/raid0.c
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ static void raid0_status(struct seq_file *seq, mddev_t *mddev)
return;
}

static void *raid0_takeover_raid5(mddev_t *mddev)
static void *raid0_takeover_raid45(mddev_t *mddev)
{
mdk_rdev_t *rdev;
raid0_conf_t *priv_conf;
Expand Down Expand Up @@ -647,12 +647,16 @@ static void *raid0_takeover_raid10(mddev_t *mddev)
static void *raid0_takeover(mddev_t *mddev)
{
/* raid0 can take over:
* raid4 - if all data disks are active.
* raid5 - providing it is Raid4 layout and one disk is faulty
* raid10 - assuming we have all necessary active disks
*/
if (mddev->level == 4)
return raid0_takeover_raid45(mddev);

if (mddev->level == 5) {
if (mddev->layout == ALGORITHM_PARITY_N)
return raid0_takeover_raid5(mddev);
return raid0_takeover_raid45(mddev);

printk(KERN_ERR "md/raid0:%s: Raid can only takeover Raid5 with layout: %d\n",
mdname(mddev), ALGORITHM_PARITY_N);
Expand Down

0 comments on commit b219911

Please sign in to comment.