Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Use bdev_is_paritition() instead of open-coding it

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 3f9b8fb4 39cd87c4

+6 -5
+3 -2
block/blk-core.c
··· 759 759 if (!bio_flagged(bio, BIO_REMAPPED)) { 760 760 if (unlikely(bio_check_eod(bio))) 761 761 goto end_io; 762 - if (bdev->bd_partno && unlikely(blk_partition_remap(bio))) 762 + if (bdev_is_partition(bdev) && 763 + unlikely(blk_partition_remap(bio))) 763 764 goto end_io; 764 765 } 765 766 ··· 990 989 if (likely(try_cmpxchg(&part->bd_stamp, &stamp, now))) 991 990 __part_stat_add(part, io_ticks, end ? now - stamp : 1); 992 991 } 993 - if (part->bd_partno) { 992 + if (bdev_is_partition(part)) { 994 993 part = bdev_whole(part); 995 994 goto again; 996 995 }
+1 -1
block/blk-mq.c
··· 92 92 struct mq_inflight *mi = priv; 93 93 94 94 if (rq->part && blk_do_io_stat(rq) && 95 - (!mi->part->bd_partno || rq->part == mi->part) && 95 + (!bdev_is_partition(mi->part) || rq->part == mi->part) && 96 96 blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT) 97 97 mi->inflight[rq_data_dir(rq)]++; 98 98
+1 -1
include/linux/part_stat.h
··· 59 59 60 60 #define part_stat_add(part, field, addnd) do { \ 61 61 __part_stat_add((part), field, addnd); \ 62 - if ((part)->bd_partno) \ 62 + if (bdev_is_partition(part)) \ 63 63 __part_stat_add(bdev_whole(part), field, addnd); \ 64 64 } while (0) 65 65
+1 -1
lib/vsprintf.c
··· 966 966 967 967 hd = bdev->bd_disk; 968 968 buf = string(buf, end, hd->disk_name, spec); 969 - if (bdev->bd_partno) { 969 + if (bdev_is_partition(bdev)) { 970 970 if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) { 971 971 if (buf < end) 972 972 *buf = 'p';