Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2436f039 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Greg Kroah-Hartman
Browse files

[PATCH] 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.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 66e0a988

fs/partitions/check.c

+5 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ static char *make_block_name(struct gendisk *disk) 
	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);
@@ -379,6 +380,10 @@ static char *make_block_name(struct gendisk *disk) 
		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;

}