a better bdevname

PATCH New Christoph Hellwig 1 participant 1 message Apr 25, 2003 VFS

Share & tools

Christoph Hellwig

author

2003-04-25 22:40 UTC #0 lore raw

PATCH 1/1 a better bdevname

With the recent devfs surgery disk_name has become useable in all contexts (it doesn't do anything but copying a string anymore), so we can use it in all contexts.

Switch over bdevname to use it instead of going through the major list.

fs/partitions/check.c +6 -0

@@ -118,6 +118,12 @@
 	return buf;
 }
 
+const char *bdevname(struct block_device *bdev, char *buf)
+{
+	int part = MINOR(bdev->bd_dev) - bdev->bd_disk->first_minor;
+	return disk_name(bdev->bd_disk, part, buf);
+}
+
 static struct parsed_partitions *
 check_partition(struct gendisk *hd, struct block_device *bdev)
 {

include/linux/fs.h +1 -4

@@ -1067,10 +1067,7 @@
 /* fs/block_dev.c */
 #define BDEVNAME_SIZE	32	/* Largest string for a blockdev identifier */
 extern const char *__bdevname(dev_t, char *buffer);
-extern inline const char *bdevname(struct block_device *bdev, char *buffer)
-{
-	return __bdevname(bdev->bd_dev, buffer);
-}
+extern const char *bdevname(struct block_device *bdev, char *buffer);
 extern struct block_device *lookup_bdev(const char *);
 extern struct block_device *open_bdev_excl(const char *, int, int, void *);
 extern void close_bdev_excl(struct block_device *, int);

kernel/ksyms.c +1 -0

@@ -512,6 +512,7 @@
 EXPORT_SYMBOL(vsnprintf);
 EXPORT_SYMBOL(vsscanf);
 EXPORT_SYMBOL(__bdevname);
+EXPORT_SYMBOL(bdevname);
 EXPORT_SYMBOL(cdevname);
 EXPORT_SYMBOL(simple_strtoull);
 EXPORT_SYMBOL(simple_strtoul);