Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1edf80d347387405ff4e8934d194d75f57a3caef

Authored by Neil Brown
Committed by Linus Torvalds
1 parent 2a7e2f7dcb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] md: remove slashes from disk names when creation dev names in sysfs 

e.g. The sx8 driver uses names like sx8/0.

This would make a md component dev name like

   /sys/block/md0/md/dev-sx8/0

which is not allowed.  So we change the '/' to '!' just like
fs/partitions/check.c(register_disk) does.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

... ... @@ -1238,6 +1238,7 @@
1238 1238 mdk_rdev_t *same_pdev;
1239 1239 char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
1240 1240 struct kobject *ko;
  1241 + char *s;
1241 1242  
1242 1243 if (rdev->mddev) {
1243 1244 MD_BUG();
... ... @@ -1277,6 +1278,8 @@
1277 1278 bdevname(rdev->bdev,b);
1278 1279 if (kobject_set_name(&rdev->kobj, "dev-%s", b) < 0)
1279 1280 return -ENOMEM;
  1281 + while ( (s=strchr(rdev->kobj.k_name, '/')) != NULL)
  1282 + *s = '!';
1280 1283  
1281 1284 list_add(&rdev->same_set, &mddev->disks);
1282 1285 rdev->mddev = mddev;