Now that we use the proper REQ_OP_WRITE_ZEROES operation everywhere we can kill this hack.
Showing the changes to include/linux/blkdev.h (1 of 23 files). Show all
Unified · Split
| @@ -339,7 +339,6 @@ struct queue_limits { · 338 unmodified lines | |||
| 339 | unsigned char misaligned; | 339 | unsigned char misaligned; |
| 340 | unsigned char discard_misaligned; | 340 | unsigned char discard_misaligned; |
| 341 | unsigned char cluster; | 341 | unsigned char cluster; |
| 342 | unsigned char discard_zeroes_data; | ||
| 343 | unsigned char raid_partial_stripes_expensive; | 342 | unsigned char raid_partial_stripes_expensive; |
| 344 | enum blk_zoned_model zoned; | 343 | enum blk_zoned_model zoned; |
| 345 | }; | 344 | }; |
| @@ -1341,7 +1340,6 @@ extern int blkdev_issue_write_same(struct block_device *bdev, sector_t sector, · 995 unmodified lines | |||
| 1341 | sector_t nr_sects, gfp_t gfp_mask, struct page *page); | 1340 | sector_t nr_sects, gfp_t gfp_mask, struct page *page); |
| 1342 | 1341 | ||
| 1343 | #define BLKDEV_DISCARD_SECURE (1 << 0) /* issue a secure erase */ | 1342 | #define BLKDEV_DISCARD_SECURE (1 << 0) /* issue a secure erase */ |
| 1344 | #define BLKDEV_DISCARD_ZERO (1 << 1) /* must reliably zero data */ | ||
| 1345 | 1343 | ||
| 1346 | extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, | 1344 | extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, |
| 1347 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); | 1345 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); |
| @@ -1541,19 +1539,6 @@ static inline int bdev_discard_alignment(struct block_device *bdev) · 193 unmodified lines | |||
| 1541 | return q->limits.discard_alignment; | 1539 | return q->limits.discard_alignment; |
| 1542 | } | 1540 | } |
| 1543 | 1541 | ||
| 1544 | static inline unsigned int queue_discard_zeroes_data(struct request_queue *q) | ||
| 1545 | { | ||
| 1546 | if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data == 1) | ||
| 1547 | return 1; | ||
| 1548 | |||
| 1549 | return 0; | ||
| 1550 | } | ||
| 1551 | |||
| 1552 | static inline unsigned int bdev_discard_zeroes_data(struct block_device *bdev) | ||
| 1553 | { | ||
| 1554 | return queue_discard_zeroes_data(bdev_get_queue(bdev)); | ||
| 1555 | } | ||
| 1556 | |||
| 1557 | static inline unsigned int bdev_write_same(struct block_device *bdev) | 1542 | static inline unsigned int bdev_write_same(struct block_device *bdev) |
| 1558 | { | 1543 | { |
| 1559 | struct request_queue *q = bdev_get_queue(bdev); | 1544 | struct request_queue *q = bdev_get_queue(bdev); |