* [PATCH] block: remove the unused blk_queue_dma_pad function
@ 2019-04-30 16:10 Christoph Hellwig
2019-04-30 16:25 ` Jens Axboe
0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2019-04-30 16:10 UTC (permalink / raw)
To: axboe; +Cc: linux-block
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] block: remove the unused blk_queue_dma_pad function
2019-04-30 16:10 Christoph Hellwig
@ 2019-04-30 16:25 ` Jens Axboe
2019-04-30 16:27 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Jens Axboe @ 2019-04-30 16:25 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block
On 4/30/19 10:10 AM, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> 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)
> {
??
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] block: remove the unused blk_queue_dma_pad function
2019-04-30 16:25 ` Jens Axboe
@ 2019-04-30 16:27 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2019-04-30 16:27 UTC (permalink / raw)
To: Jens Axboe; +Cc: Christoph Hellwig, linux-block
On Tue, Apr 30, 2019 at 10:25:57AM -0600, Jens Axboe wrote:
> ??
Bah, that shouldn't have slipped into this patch..
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] block: remove the unused blk_queue_dma_pad function
@ 2019-04-30 17:56 Christoph Hellwig
2019-04-30 21:44 ` Chaitanya Kulkarni
2019-04-30 22:13 ` Jens Axboe
0 siblings, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2019-04-30 17:56 UTC (permalink / raw)
To: axboe; +Cc: linux-block
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-settings.c | 16 ----------------
include/linux/blkdev.h | 1 -
2 files changed, 17 deletions(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] block: remove the unused blk_queue_dma_pad function
2019-04-30 17:56 [PATCH] block: remove the unused blk_queue_dma_pad function Christoph Hellwig
@ 2019-04-30 21:44 ` Chaitanya Kulkarni
2019-04-30 22:13 ` Jens Axboe
1 sibling, 0 replies; 6+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-30 21:44 UTC (permalink / raw)
To: Christoph Hellwig, axboe@kernel.dk; +Cc: linux-block@vger.kernel.org
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 4/30/19 10:56 AM, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/blk-settings.c | 16 ----------------
> include/linux/blkdev.h | 1 -
> 2 files changed, 17 deletions(-)
>
> 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,
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] block: remove the unused blk_queue_dma_pad function
2019-04-30 17:56 [PATCH] block: remove the unused blk_queue_dma_pad function Christoph Hellwig
2019-04-30 21:44 ` Chaitanya Kulkarni
@ 2019-04-30 22:13 ` Jens Axboe
1 sibling, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2019-04-30 22:13 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-block
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-30 22:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-30 17:56 [PATCH] block: remove the unused blk_queue_dma_pad function Christoph Hellwig
2019-04-30 21:44 ` Chaitanya Kulkarni
2019-04-30 22:13 ` Jens Axboe
-- strict thread matches above, loose matches on Subject: below --
2019-04-30 16:10 Christoph Hellwig
2019-04-30 16:25 ` Jens Axboe
2019-04-30 16:27 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).