From 0684d8530e26f8487b48a0ee41305f443d3525f1 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 12 Jan 2006 01:05:23 -0800 Subject: [PATCH] --- yaml --- r: 18047 b: refs/heads/master c: 1edf80d347387405ff4e8934d194d75f57a3caef h: refs/heads/master i: 18045: 10bc322482ac99ac83d42bafcb66bfb912658916 18043: 9827ee3f8ab06692fad0df8e2bc4de5d746606ed 18039: 55babd5afeb2e177d5f1690c909832691984da03 18031: 4f375911949d58b8d03475ff771b0f52c6e7ff7d 18015: 6cfd7d5aba3893ac5da790468c261180bf19d4af 17983: c5d65600aa68f3dd150752753a2009792a1216a4 17919: 75e8ca1c5d5316a0863a96672c14ecfbc0182bed v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8fc4b618d5ea..71a237aa59a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a7e2f7dcb81279e73aefb691ea55ab3540e408a +refs/heads/master: 1edf80d347387405ff4e8934d194d75f57a3caef diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 0302723fa21f..1778104e106c 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -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(); @@ -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;