Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18047
b: refs/heads/master
c: 1edf80d
h: refs/heads/master
i:
  18045: 10bc322
  18043: 9827ee3
  18039: 55babd5
  18031: 4f37591
  18015: 6cfd7d5
  17983: c5d6560
  17919: 75e8ca1
v: v3
  • Loading branch information
Neil Brown authored and Linus Torvalds committed Jan 12, 2006
1 parent ecc0847 commit 0684d85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2a7e2f7dcb81279e73aefb691ea55ab3540e408a
refs/heads/master: 1edf80d347387405ff4e8934d194d75f57a3caef
3 changes: 3 additions & 0 deletions trunk/drivers/md/md.c
Original file line number Diff line number Diff line change
Expand Up @@ -1238,6 +1238,7 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
mdk_rdev_t *same_pdev;
char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
struct kobject *ko;
char *s;

if (rdev->mddev) {
MD_BUG();
Expand Down Expand Up @@ -1277,6 +1278,8 @@ static int bind_rdev_to_array(mdk_rdev_t * rdev, mddev_t * mddev)
bdevname(rdev->bdev,b);
if (kobject_set_name(&rdev->kobj, "dev-%s", b) < 0)
return -ENOMEM;
while ( (s=strchr(rdev->kobj.k_name, '/')) != NULL)
*s = '!';

list_add(&rdev->same_set, &mddev->disks);
rdev->mddev = mddev;
Expand Down

0 comments on commit 0684d85

Please sign in to comment.