Skip to contentSkip to conversation

block: remove the unused blk_queue_dma_pad function

PATCH In review Christoph Hellwig 2 participants 3 messages Apr 30, 2019 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: remove the unused blk_queue_dma_pad function

---
 block/bio.c            |  2 +-
 block/blk-settings.c   | 16 ----------------
 include/linux/blkdev.h |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)
block/bio.c +1 -1
index 029afb121a48..22da218fbcda 100644
@@ -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;
block/blk-settings.c +0 -16
index 6375afaedcec..e8889e48b032 100644
@@ -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
include/linux/blkdev.h +0 -1
index 99aa98f60b9e..bd3e3f09bfa0 100644
@@ -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,
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 12 lines · Christoph Hellwig
---
 block/bio.c            |  2 +-
 block/blk-settings.c   | 16 ----------------
 include/linux/blkdev.h |  1 -
 3 files changed, 1 insertion(+), 18 deletions(-)
block/bio.c +0 -0
index 029afb121a48..22da218fbcda 100644

block/bio.c static void bio_copy_kern_endio_read(struct bio *bio) · line 1580

Quoted 6 lines
block/bio.c +1 -1
@@ -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)
 {

??

Signature · 1 line
Jens Axboe
#2 lore raw
Quoted 1 line · Jens Axboe

??

Bah, that shouldn't have slipped into this patch..