diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-06-25 18:02:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 20:00:40 -0400 |
commit | 90a9befb20bd455b167b02d4018b5e882da76505 (patch) | |
tree | 0878fada6fa7e294a99e0087069d81aeaaa80a94 /drivers/md/md.c | |
parent | a29fd614a6af57610b1963e3445f1758c3806187 (diff) |
drivers/md/md.c: use strreplace()
There's no point in starting over when we meet a '/'. This also
eliminates a stack variable and a little .text.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 4dbed4a67aaf..8d9f89b4519d 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -2024,7 +2024,6 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev) | |||
2024 | { | 2024 | { |
2025 | char b[BDEVNAME_SIZE]; | 2025 | char b[BDEVNAME_SIZE]; |
2026 | struct kobject *ko; | 2026 | struct kobject *ko; |
2027 | char *s; | ||
2028 | int err; | 2027 | int err; |
2029 | 2028 | ||
2030 | /* prevent duplicates */ | 2029 | /* prevent duplicates */ |
@@ -2070,8 +2069,7 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev) | |||
2070 | return -EBUSY; | 2069 | return -EBUSY; |
2071 | } | 2070 | } |
2072 | bdevname(rdev->bdev,b); | 2071 | bdevname(rdev->bdev,b); |
2073 | while ( (s=strchr(b, '/')) != NULL) | 2072 | strreplace(b, '/', '!'); |
2074 | *s = '!'; | ||
2075 | 2073 | ||
2076 | rdev->mddev = mddev; | 2074 | rdev->mddev = mddev; |
2077 | printk(KERN_INFO "md: bind<%s>\n", b); | 2075 | printk(KERN_INFO "md: bind<%s>\n", b); |