From ddac1641ee1e2686c2211a8d671ea723634dfc89 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 10 Aug 2022 20:28:55 -0400 Subject: Update bcachefs sources to 90a9c61e2b bcachefs: Switch bch2_btree_delete_range() to bch2_trans_run() --- include/linux/blkdev.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/linux/blkdev.h') diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4ce43b5c..01b3d4ad 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -69,8 +69,7 @@ static inline void submit_bio(struct bio *bio) generic_make_request(bio); } -int blkdev_issue_discard(struct block_device *, sector_t, - sector_t, gfp_t, unsigned long); +int blkdev_issue_discard(struct block_device *, sector_t, sector_t, gfp_t); #define bdev_get_queue(bdev) (&((bdev)->queue)) @@ -85,7 +84,7 @@ int blkdev_issue_discard(struct block_device *, sector_t, #define PAGE_SECTORS (1 << PAGE_SECTORS_SHIFT) #define SECTOR_MASK (PAGE_SECTORS - 1) -#define blk_queue_discard(q) ((void) (q), 0) +#define bdev_max_discard_sectors(bdev) ((void) (bdev), 0) #define blk_queue_nonrot(q) ((void) (q), 0) unsigned bdev_logical_block_size(struct block_device *bdev); -- cgit v1.2.3