block: introduce bdev_rot()

Introduce the helper function bdev_rot() to test if a block device is a
rotational one. The existing function bdev_nonrot() which tests for the
opposite condition is redefined using this new helper.
This avoids the double negation (operator and name) that appears when
testing if a block device is a rotational device, thus making the code a
little easier to read.

Call sites of bdev_nonrot() in the block layer are updated to use this
new helper.  Remaining users in other subsystems are left unchanged for
now.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/ioctl.c b/block/ioctl.c
index 344478348a54e36736baa73a9c5ae7bebe604d3d..fd48f82f9f0317b4bc22955dde3e3ff4fafbdc98 100644 (file)
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -692,7 +692,7 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode,
                                    queue_max_sectors(bdev_get_queue(bdev)));
                return put_ushort(argp, max_sectors);
        case BLKROTATIONAL:
-               return put_ushort(argp, !bdev_nonrot(bdev));
+               return put_ushort(argp, bdev_rot(bdev));
        case BLKRASET:
        case BLKFRASET:
                if(!capable(CAP_SYS_ADMIN))

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bd59c0e9508b729942e501ec02983dce4e6828fe..ae303958404569cc32a163874521c002b95fa6cc 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -969,7 +969,7 @@ static void loop_update_limits(struct loop_device *lo, struct queue_limits *lim,
        lim->features &= ~(BLK_FEAT_WRITE_CACHE | BLK_FEAT_ROTATIONAL);
        if (file->f_op->fsync && !(lo->lo_flags & LO_FLAGS_READ_ONLY))
                lim->features |= BLK_FEAT_WRITE_CACHE;
-       if (backing_bdev && !bdev_nonrot(backing_bdev))
+       if (backing_bdev && bdev_rot(backing_bdev))
                lim->features |= BLK_FEAT_ROTATIONAL;
        lim->max_hw_discard_sectors = max_discard_sectors;
        lim->max_write_zeroes_sectors = max_discard_sectors;

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 3da31bb1183eb73f574285981069d31e9fa01699..5e366502fb757ec89bf1d70f7019ff48d978ac3d 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -298,7 +298,7 @@ static void nvmet_execute_get_log_page_rmi(struct nvmet_req *req)
        if (status)
                goto out;
 
-       if (!req->ns->bdev || bdev_nonrot(req->ns->bdev)) {
+       if (!req->ns->bdev || !bdev_rot(req->ns->bdev)) {
                status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
                goto out;
        }
@@ -1084,7 +1084,7 @@ static void nvmet_execute_id_cs_indep(struct nvmet_req *req)
        id->nmic = NVME_NS_NMIC_SHARED;
        if (req->ns->readonly)
                id->nsattr |= NVME_NS_ATTR_RO;
-       if (req->ns->bdev && !bdev_nonrot(req->ns->bdev))
+       if (req->ns->bdev && bdev_rot(req->ns->bdev))
                id->nsfeat |= NVME_NS_ROTATIONAL;
        /*
         * We need flush command to flush the file's metadata,

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1e5b5547929f03aeaf177f79cffdd1f14cd8fe24..2ae4c45e495933c2dd89e9c072747145d22a5d81 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1461,9 +1461,14 @@ bdev_write_zeroes_unmap_sectors(struct block_device *bdev)
        return bdev_limits(bdev)->max_wzeroes_unmap_sectors;
 }
 
+static inline bool bdev_rot(struct block_device *bdev)
+{
+       return blk_queue_rot(bdev_get_queue(bdev));
+}
+
 static inline bool bdev_nonrot(struct block_device *bdev)
 {
-       return !blk_queue_rot(bdev_get_queue(bdev));
+       return !bdev_rot(bdev);
 }
 
 static inline bool bdev_synchronous(struct block_device *bdev)