Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- block/bio.c | 2 +- block/blk-settings.c | 16 ---------------- include/linux/blkdev.h | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/block/bio.c b/block/bio.c index 029afb121a48..22da218fbcda 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1576,7 +1576,7 @@ static void bio_copy_kern_endio_read(struct bio *bio) * device. Returns an error pointer in case of error. */ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, - gfp_t gfp_mask, int reading) + gfp_t gfp_mask, int reading, struct bio **biop) { unsigned long kaddr = (unsigned long)data; unsigned long end = (kaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT; diff --git a/block/blk-settings.c b/block/blk-settings.c index 6375afaedcec..e8889e48b032 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -662,22 +662,6 @@ void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, } EXPORT_SYMBOL(disk_stack_limits); -/** - * blk_queue_dma_pad - set pad mask - * @q: the request queue for the device - * @mask: pad mask - * - * Set dma pad mask. - * - * Appending pad buffer to a request modifies the last entry of a - * scatter list such that it includes the pad buffer. - **/ -void blk_queue_dma_pad(struct request_queue *q, unsigned int mask) -{ - q->dma_pad_mask = mask; -} -EXPORT_SYMBOL(blk_queue_dma_pad); - /** * blk_queue_update_dma_pad - update pad mask * @q: the request queue for the device diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 99aa98f60b9e..bd3e3f09bfa0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1069,7 +1069,6 @@ extern int bdev_stack_limits(struct queue_limits *t, struct block_device *bdev, extern void disk_stack_limits(struct gendisk *disk, struct block_device *bdev, sector_t offset); extern void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b); -extern void blk_queue_dma_pad(struct request_queue *, unsigned int); extern void blk_queue_update_dma_pad(struct request_queue *, unsigned int); extern int blk_queue_dma_drain(struct request_queue *q, dma_drain_needed_fn *dma_drain_needed, -- 2.20.1