diff options
author | Damien Le Moal | 2017-01-12 15:58:32 +0100 |
---|---|---|
committer | Jens Axboe | 2017-01-12 15:58:32 +0100 |
commit | f99e86485cc32cd16e5cc97f9bb0474f28608d84 (patch) | |
tree | 4ca5ba54827883c29f70b55f6aad314a898f26bd /fs/f2fs/segment.c | |
parent | nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too (diff) | |
download | kernel-qcow2-linux-f99e86485cc32cd16e5cc97f9bb0474f28608d84.tar.gz kernel-qcow2-linux-f99e86485cc32cd16e5cc97f9bb0474f28608d84.tar.xz kernel-qcow2-linux-f99e86485cc32cd16e5cc97f9bb0474f28608d84.zip |
block: Rename blk_queue_zone_size and bdev_zone_size
All block device data fields and functions returning a number of 512B
sectors are by convention named xxx_sectors while names in the form
xxx_size are generally used for a number of bytes. The blk_queue_zone_size
and bdev_zone_size functions were not following this convention so rename
them.
No functional change is introduced by this patch.
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Collapsed the two patches, they were nonsensically split and broke
bisection.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/f2fs/segment.c')
-rw-r--r-- | fs/f2fs/segment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 0738f48293cc..0d8802453758 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -713,8 +713,8 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, } sector = SECTOR_FROM_BLOCK(blkstart); - if (sector & (bdev_zone_size(bdev) - 1) || - nr_sects != bdev_zone_size(bdev)) { + if (sector & (bdev_zone_sectors(bdev) - 1) || + nr_sects != bdev_zone_sectors(bdev)) { f2fs_msg(sbi->sb, KERN_INFO, "(%d) %s: Unaligned discard attempted (block %x + %x)", devi, sbi->s_ndevs ? FDEV(devi).path: "", |