diff options
author | Damien Le Moal <damien.lemoal@wdc.com> | 2019-07-01 01:09:16 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-07-11 22:04:37 -0400 |
commit | bd976e52725965ddcceb9abecbcc7ca46863665c (patch) | |
tree | 920d0b976f212f1a4af42c67f271ff8c18406589 /include/linux/blkdev.h | |
parent | b4c5875d36178e8df409bdce232f270cac89fafe (diff) |
block: Kill gfp_t argument of blkdev_report_zones()
Only GFP_KERNEL and GFP_NOIO are used with blkdev_report_zones(). In
preparation of using vmalloc() for large report buffer and zone array
allocations used by this function, remove its "gfp_t gfp_mask" argument
and rely on the caller context to use memalloc_noio_save/restore() where
necessary (block layer zone revalidation and dm-zoned I/O error path).
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 259bd7ad8312..05036e3e3458 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -347,7 +347,7 @@ struct queue_limits { | |||
347 | extern unsigned int blkdev_nr_zones(struct block_device *bdev); | 347 | extern unsigned int blkdev_nr_zones(struct block_device *bdev); |
348 | extern int blkdev_report_zones(struct block_device *bdev, | 348 | extern int blkdev_report_zones(struct block_device *bdev, |
349 | sector_t sector, struct blk_zone *zones, | 349 | sector_t sector, struct blk_zone *zones, |
350 | unsigned int *nr_zones, gfp_t gfp_mask); | 350 | unsigned int *nr_zones); |
351 | extern int blkdev_reset_zones(struct block_device *bdev, sector_t sectors, | 351 | extern int blkdev_reset_zones(struct block_device *bdev, sector_t sectors, |
352 | sector_t nr_sectors, gfp_t gfp_mask); | 352 | sector_t nr_sectors, gfp_t gfp_mask); |
353 | extern int blk_revalidate_disk_zones(struct gendisk *disk); | 353 | extern int blk_revalidate_disk_zones(struct gendisk *disk); |
@@ -1673,8 +1673,7 @@ struct block_device_operations { | |||
1673 | /* this callback is with swap_lock and sometimes page table lock held */ | 1673 | /* this callback is with swap_lock and sometimes page table lock held */ |
1674 | void (*swap_slot_free_notify) (struct block_device *, unsigned long); | 1674 | void (*swap_slot_free_notify) (struct block_device *, unsigned long); |
1675 | int (*report_zones)(struct gendisk *, sector_t sector, | 1675 | int (*report_zones)(struct gendisk *, sector_t sector, |
1676 | struct blk_zone *zones, unsigned int *nr_zones, | 1676 | struct blk_zone *zones, unsigned int *nr_zones); |
1677 | gfp_t gfp_mask); | ||
1678 | struct module *owner; | 1677 | struct module *owner; |
1679 | const struct pr_ops *pr_ops; | 1678 | const struct pr_ops *pr_ops; |
1680 | }; | 1679 | }; |