Commit ea3edd4d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove __bdevname 



There is no good reason for __bdevname to exist.  Just open code
printing the string in the callers.  For three of them the format
string can be trivially merged into existing printk statements,
and in init/do_mounts.c we can at least do the scnprintf once at
the start of the function, and unconditional of CONFIG_BLOCK to
make the output for tiny configfs a little more helpful.

Acked-by: Theodore Ts'o <tytso@mit.edu> # for ext4
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d2332c5c

block/partition-generic.c

+0 −14
Original line number Diff line number Diff line
@@ -57,20 +57,6 @@ const char *bio_devname(struct bio *bio, char *buf) 
}

EXPORT_SYMBOL(bio_devname);



/*

 * There's very little reason to use this, you should really

 * have a struct block_device just about everywhere and use

 * bdevname() instead.

 */

const char *__bdevname(dev_t dev, char *buffer)

{

	scnprintf(buffer, BDEVNAME_SIZE, "unknown-block(%u,%u)",

				MAJOR(dev), MINOR(dev));

	return buffer;

}



EXPORT_SYMBOL(__bdevname);



static ssize_t part_partition_show(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

drivers/md/md.c

+2 −2
Original line number Diff line number Diff line
@@ -2491,12 +2491,12 @@ static int lock_rdev(struct md_rdev *rdev, dev_t dev, int shared) 
{

	int err = 0;

	struct block_device *bdev;

	char b[BDEVNAME_SIZE];



	bdev = blkdev_get_by_dev(dev, FMODE_READ|FMODE_WRITE|FMODE_EXCL,

				 shared ? (struct md_rdev *)lock_rdev : rdev);

	if (IS_ERR(bdev)) {

		pr_warn("md: could not open %s.\n", __bdevname(dev, b));

		pr_warn("md: could not open device unknown-block(%u,%u).\n",

			MAJOR(dev), MINOR(dev));

		return PTR_ERR(bdev);

	}

	rdev->bdev = bdev;

fs/ext4/super.c

+3 −3
Original line number Diff line number Diff line
@@ -927,7 +927,6 @@ void ext4_update_dynamic_rev(struct super_block *sb) 
static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)

{

	struct block_device *bdev;

	char b[BDEVNAME_SIZE];



	bdev = blkdev_get_by_dev(dev, FMODE_READ|FMODE_WRITE|FMODE_EXCL, sb);

	if (IS_ERR(bdev))
@@ -935,8 +934,9 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb) 
	return bdev;



fail:

	ext4_msg(sb, KERN_ERR, "failed to open journal device %s: %ld",

			__bdevname(dev, b), PTR_ERR(bdev));

	ext4_msg(sb, KERN_ERR,

		 "failed to open journal device unknown-block(%u,%u) %ld",

		 MAJOR(dev), MINOR(dev), PTR_ERR(bdev));

	return NULL;

}

fs/reiserfs/journal.c

+2 −3
Original line number Diff line number Diff line
@@ -2599,7 +2599,6 @@ static int journal_init_dev(struct super_block *super, 
	int result;

	dev_t jdev;

	fmode_t blkdev_mode = FMODE_READ | FMODE_WRITE | FMODE_EXCL;

	char b[BDEVNAME_SIZE];



	result = 0;
@@ -2621,8 +2620,8 @@ static int journal_init_dev(struct super_block *super, 
			result = PTR_ERR(journal->j_dev_bd);

			journal->j_dev_bd = NULL;

			reiserfs_warning(super, "sh-458",

					 "cannot init journal device '%s': %i",

					 __bdevname(jdev, b), result);

					 "cannot init journal device unknown-block(%u,%u): %i",

					 MAJOR(jdev), MINOR(jdev), result);

			return result;

		} else if (jdev != super->s_dev)

			set_blocksize(journal->j_dev_bd, super->s_blocksize);

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2699,7 +2699,6 @@ static inline void unregister_chrdev(unsigned int major, const char *name) 


#ifdef CONFIG_BLOCK

#define BLKDEV_MAJOR_MAX	512

extern const char *__bdevname(dev_t, char *buffer);

extern const char *bdevname(struct block_device *bdev, char *buffer);

extern struct block_device *lookup_bdev(const char *);

extern void blkdev_show(struct seq_file *,off_t);

CRA Git | Maintained and supported by SUSTech CRA and CCSE