Skip to content

Commit

Permalink
block: display the correct diskname for bio
Browse files Browse the repository at this point in the history
bio_devname use __bdevname to display the device name, and can
only show the major and minor of the part0,
Fix this by using disk_name to display the correct name.

Fixes: 74d4699 ("block: replace bi_bdev with a gendisk pointer and partitions index")
Reviewed-by: Omar Sandoval <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jiufei Xue <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Jiufei Xue authored and axboe committed Mar 1, 2018
1 parent 7c5a0dc commit 9c0fb1e
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 6 additions & 0 deletions block/partition-generic.c
Original file line number Diff line number Diff line change
@@ -51,6 +51,12 @@ const char *bdevname(struct block_device *bdev, char *buf)

EXPORT_SYMBOL(bdevname);

const char *bio_devname(struct bio *bio, char *buf)
{
return disk_name(bio->bi_disk, bio->bi_partno, 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
4 changes: 1 addition & 3 deletions include/linux/bio.h
Original file line number Diff line number Diff line change
@@ -511,6 +511,7 @@ void zero_fill_bio(struct bio *bio);
extern struct bio_vec *bvec_alloc(gfp_t, int, unsigned long *, mempool_t *);
extern void bvec_free(mempool_t *, struct bio_vec *, unsigned int);
extern unsigned int bvec_nr_vecs(unsigned short idx);
extern const char *bio_devname(struct bio *bio, char *buffer);

#define bio_set_dev(bio, bdev) \
do { \
@@ -529,9 +530,6 @@ do { \
#define bio_dev(bio) \
disk_devt((bio)->bi_disk)

#define bio_devname(bio, buf) \
__bdevname(bio_dev(bio), (buf))

#ifdef CONFIG_BLK_CGROUP
int bio_associate_blkcg(struct bio *bio, struct cgroup_subsys_state *blkcg_css);
void bio_disassociate_task(struct bio *bio);

0 comments on commit 9c0fb1e

Please sign in to comment.