Skip to content

block: remove bdev_nonrot() #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+10 −15
Open

block: remove bdev_nonrot() #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/md/raid1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ static bool raid1_add_conf(struct r1conf *conf, struct md_rdev *rdev, int disk,
if (info->rdev)
return false;

if (bdev_nonrot(rdev->bdev)) {
if (!bdev_rot(rdev->bdev)) {
set_bit(Nonrot, &rdev->flags);
WRITE_ONCE(conf->nonrot_disks, conf->nonrot_disks + 1);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid10.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static struct md_rdev *read_balance(struct r10conf *conf,
if (!do_balance)
break;

nonrot = bdev_nonrot(rdev->bdev);
nonrot = !bdev_rot(rdev->bdev);
has_nonrot_disk |= nonrot;
pending = atomic_read(&rdev->nr_pending);
if (min_pending > pending && nonrot) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7541,7 +7541,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
rdev_for_each(rdev, mddev) {
if (test_bit(Journal, &rdev->flags))
continue;
if (bdev_nonrot(rdev->bdev)) {
if (!bdev_rot(rdev->bdev)) {
conf->batch_bio_dispatch = false;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static int fd_configure_device(struct se_device *dev)
*/
dev->dev_attrib.max_write_same_len = 0xFFFF;

if (bdev_nonrot(bdev))
if (!bdev_rot(bdev))
dev->dev_attrib.is_nonrot = 1;
} else {
if (!(fd_dev->fbd_flags & FBDF_HAS_SIZE)) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_iblock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static int iblock_configure_device(struct se_device *dev)
else
dev->dev_attrib.max_write_same_len = 0xFFFF;

if (bdev_nonrot(bd))
if (!bdev_rot(bd))
dev->dev_attrib.is_nonrot = 1;

target_configure_write_atomic_from_bdev(&dev->dev_attrib, bd);
Expand Down
4 changes: 2 additions & 2 deletions fs/btrfs/volumes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,
set_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);
}

if (!bdev_nonrot(file_bdev(bdev_file)))
if (bdev_rot(file_bdev(bdev_file)))
fs_devices->rotating = true;

if (bdev_max_discard_sectors(file_bdev(bdev_file)))
Expand Down Expand Up @@ -2919,7 +2919,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path

atomic64_add(device->total_bytes, &fs_info->free_chunk_space);

if (!bdev_nonrot(device->bdev))
if (bdev_rot(device->bdev))
fs_devices->rotating = true;

orig_super_total_bytes = btrfs_super_total_bytes(fs_info->super_copy);
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/mballoc-test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ static int mbt_mb_init(struct super_block *sb)
ext4_fsblk_t block;
int ret;

/* needed by ext4_mb_init->bdev_nonrot(sb->s_bdev) */
/* needed by ext4_mb_init->bdev_rot(sb->s_bdev) */
sb->s_bdev = kzalloc_obj(*sb->s_bdev);
if (sb->s_bdev == NULL)
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion fs/ext4/mballoc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3836,7 +3836,7 @@ int ext4_mb_init(struct super_block *sb)
spin_lock_init(&lg->lg_prealloc_lock);
}

if (bdev_nonrot(sb->s_bdev))
if (!bdev_rot(sb->s_bdev))
sbi->s_mb_max_linear_groups = 0;
else
sbi->s_mb_max_linear_groups = MB_DEFAULT_LINEAR_LIMIT;
Expand Down
5 changes: 0 additions & 5 deletions include/linux/blkdev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,11 +1467,6 @@ 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 !bdev_rot(bdev);
}

static inline bool bdev_synchronous(struct block_device *bdev)
{
return bdev->bd_disk->queue->limits.features & BLK_FEAT_SYNCHRONOUS;
Expand Down
2 changes: 1 addition & 1 deletion mm/swapfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3460,7 +3460,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
if (si->bdev && bdev_synchronous(si->bdev))
si->flags |= SWP_SYNCHRONOUS_IO;

if (si->bdev && bdev_nonrot(si->bdev)) {
if (si->bdev && !bdev_rot(si->bdev)) {
si->flags |= SWP_SOLIDSTATE;
} else {
atomic_inc(&nr_rotate_swap);
Expand Down