Fix block device symlink name
PATCH 1/1 Fix block device symlink name
As noted further on the this file, some block devices have a / in their name, so fix the "block:..." symlink name the same as the /sys/block name.
(code and comment copied from below)
Signed-off-by Stephen Rothwell <[email protected]>
---
fs/partitions/check.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
This might also be a candidate for a stable kernel.
Signature · 4 lines
Cheers, Stephen Rothwell [email protected] 088ec2acec602096210801cfdc0e4732d81de10d
fs/partitions/check.c +5 -0
@@ -345,6 +345,7 @@ static char *make_block_name(struct gendchar *name;static char *block_str ="block:" ;int size; +char *s; size =strlen (block_str) +strlen (disk->disk_name) +1 ; name =kmalloc (size,GFP_KERNEL );
@@ -352,6 +353,10 @@ static char *make_block_name(struct gendreturn NULL ;strcpy (name, block_str);strcat (name, disk->disk_name); +/* ewww... some of these buggers have / in name... */ + s =strchr (name,'/' ); +if (s) + *s ='!' ;return name; }
Signature · 1 line
1.2.4
fs/partitions/check.c static char *make_block_name(struct gend · line 362
Quoted 11 lines
fs/partitions/check.c +4
-0@@ -352,6 +353,10 @@ static char *make_block_name(struct gendreturn NULL ;strcpy (name, block_str);strcat (name, disk->disk_name); +/* ewww... some of these buggers have / in name... */ + s =strchr (name,'/' ); +if (s) + *s ='!' ;return name; }
Can they have multiple '/'? If so, we need a while loop.
Jan Engelhardt
Quoted 14 lines · On Tue, 11 Apr 2006 13:38:09 +0200 (MEST) Jan Engelhardt…
fs/partitions/check.c static char *make_block_name(struct gend · line 362
Quoted 12 lines
fs/partitions/check.c +4
-0@@ -352,6 +353,10 @@ static char *make_block_name(struct gendreturn NULL ;strcpy (name, block_str);strcat (name, disk->disk_name); +/* ewww... some of these buggers have / in name... */ + s =strchr (name,'/' ); +if (s) + *s ='!' ;return name; }Can they have multiple '/'? If so, we need a while loop.
The other place that fixes this (just 10 or so lines further on in this file) does not loop. Looking through the block devices, there is no obvious place that creates a name with more than one '/'.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/