[PATCH] Fix block device symlink name

[PATCH] Fix block device symlink name

[Stephen Rothwell]

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 <sfr@canb.auug.org.au>
---

 fs/partitions/check.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

This might also be a candidate for a stable kernel.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

088ec2acec602096210801cfdc0e4732d81de10d
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index f924f45..2ef03aa 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -345,6 +345,7 @@ static char *make_block_name(struct gend
 	char *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 gend
 		return 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;
 }
 
-- 
1.2.4

Re: [PATCH] Fix block device symlink name

[Jan Engelhardt]

>@@ -352,6 +353,10 @@ static char *make_block_name(struct gend
> 		return 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
-- 

Re: [PATCH] Fix block device symlink name

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

On Tue, 11 Apr 2006 13:38:09 +0200 (MEST) Jan Engelhardt <jengelh@linux01.gwdg.de> wrote:
>
> >@@ -352,6 +353,10 @@ static char *make_block_name(struct gend
> > 		return 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 '/'.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 189 bytes --]