| Message ID | 20220415045258.199825-9-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/27] target: remove an incorrect unmap zeroes data deduction | expand |
On 4/14/22 21:52, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Acked-by: David Sterba <dsterba@suse.com> > --- Looks good. Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> -ck
On 4/15/22 12:52, Christoph Hellwig wrote: > Signed-off-by: Christoph Hellwig <hch@lst.de> > Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> > Acked-by: David Sterba <dsterba@suse.com> LGTM. Reviewed-by: Anand Jain <anand.jain@oracle.com> > --- > fs/btrfs/zoned.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c > index 1b1b310c3c510..f72cad7391a11 100644 > --- a/fs/btrfs/zoned.c > +++ b/fs/btrfs/zoned.c > @@ -350,7 +350,6 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) > struct btrfs_fs_info *fs_info = device->fs_info; > struct btrfs_zoned_device_info *zone_info = NULL; > struct block_device *bdev = device->bdev; > - struct request_queue *queue = bdev_get_queue(bdev); > unsigned int max_active_zones; > unsigned int nactive; > sector_t nr_sectors; > @@ -410,7 +409,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) > if (!IS_ALIGNED(nr_sectors, zone_sectors)) > zone_info->nr_zones++; > > - max_active_zones = queue_max_active_zones(queue); > + max_active_zones = bdev_max_active_zones(bdev); > if (max_active_zones && max_active_zones < BTRFS_MIN_ACTIVE_ZONES) { > btrfs_err_in_rcu(fs_info, > "zoned: %s: max active zones %u is too small, need at least %u active zones",
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 1b1b310c3c510..f72cad7391a11 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -350,7 +350,6 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) struct btrfs_fs_info *fs_info = device->fs_info; struct btrfs_zoned_device_info *zone_info = NULL; struct block_device *bdev = device->bdev; - struct request_queue *queue = bdev_get_queue(bdev); unsigned int max_active_zones; unsigned int nactive; sector_t nr_sectors; @@ -410,7 +409,7 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) if (!IS_ALIGNED(nr_sectors, zone_sectors)) zone_info->nr_zones++; - max_active_zones = queue_max_active_zones(queue); + max_active_zones = bdev_max_active_zones(bdev); if (max_active_zones && max_active_zones < BTRFS_MIN_ACTIVE_ZONES) { btrfs_err_in_rcu(fs_info, "zoned: %s: max active zones %u is too small, need at least %u active zones",