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>

diff --git a/block/blk-core.c b/block/blk-core.c
index a16b5abdbbf56f44611d34fd238c0ee3a00d72f5..20322abc60822ab5f2b8335cee8d3e6c797bf852 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -759,7 +759,8 @@ void submit_bio_noacct(struct bio *bio)
        if (!bio_flagged(bio, BIO_REMAPPED)) {
                if (unlikely(bio_check_eod(bio)))
                        goto end_io;
-               if (bdev->bd_partno && unlikely(blk_partition_remap(bio)))
+               if (bdev_is_partition(bdev) &&
+                   unlikely(blk_partition_remap(bio)))
                        goto end_io;
        }
 
@@ -989,7 +990,7 @@ again:
                if (likely(try_cmpxchg(&part->bd_stamp, &stamp, now)))
                        __part_stat_add(part, io_ticks, end ? now - stamp : 1);
        }
-       if (part->bd_partno) {
+       if (bdev_is_partition(part)) {
                part = bdev_whole(part);
                goto again;
        }

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 32afb87efbd0ef6a4814d05aa79020a07cbfc19f..43bb8f50a07cf0adc9f761764bd6a1650f2b931b 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -92,7 +92,7 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv)
        struct mq_inflight *mi = priv;
 
        if (rq->part && blk_do_io_stat(rq) &&
-           (!mi->part->bd_partno || rq->part == mi->part) &&
+           (!bdev_is_partition(mi->part) || rq->part == mi->part) &&
            blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
                mi->inflight[rq_data_dir(rq)]++;
 

diff --git a/include/linux/part_stat.h b/include/linux/part_stat.h
index abeba356bc3f5794275e14d83036d7020031c40f..ac8c44dd8237e8e855a0592dabd0d1899ec10688 100644 (file)
--- a/include/linux/part_stat.h
+++ b/include/linux/part_stat.h
@@ -59,7 +59,7 @@ static inline void part_stat_set_all(struct block_device *part, int value)
 
 #define part_stat_add(part, field, addnd)      do {                    \
        __part_stat_add((part), field, addnd);                          \
-       if ((part)->bd_partno)                                          \
+       if (bdev_is_partition(part))                                    \
                __part_stat_add(bdev_whole(part), field, addnd);        \
 } while (0)
 

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 552738f14275a742fbdff8e876b42b3d850d87fb..3f9f1b959ef026e48f0feaa2d55a1a12332f890e 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -966,7 +966,7 @@ char *bdev_name(char *buf, char *end, struct block_device *bdev,
 
        hd = bdev->bd_disk;
        buf = string(buf, end, hd->disk_name, spec);
-       if (bdev->bd_partno) {
+       if (bdev_is_partition(bdev)) {
                if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) {
                        if (buf < end)
                                *buf = 'p';