Commit 9df1bb9b authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "block: Fix bounce limit setting in DM" 



This reverts commit a05c0205.

DM doesn't need to access the bounce_pfn directly.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 3969251b

block/blk-settings.c

+0 −17
Original line number Diff line number Diff line
@@ -193,23 +193,6 @@ void blk_queue_bounce_limit(struct request_queue *q, u64 dma_mask) 
}

EXPORT_SYMBOL(blk_queue_bounce_limit);



/**

 * blk_queue_bounce_pfn - set the bounce buffer limit for queue

 * @q: the request queue for the device

 * @pfn: max address

 *

 * Description:

 *    This function is similar to blk_queue_bounce_limit except it

 *    neither changes allocation flags, nor does it set up the ISA DMA

 *    pool. This function should only be used by stacking drivers.

 *    Hardware drivers should use blk_queue_bounce_limit instead.

 */

void blk_queue_bounce_pfn(struct request_queue *q, u64 pfn)

{

	q->limits.bounce_pfn = pfn;

}

EXPORT_SYMBOL(blk_queue_bounce_pfn);



/**

 * blk_queue_max_sectors - set max sectors for a request for this queue

 * @q:  the request queue for the device

drivers/md/dm-table.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q) 
	blk_queue_max_segment_size(q, t->limits.max_segment_size);

	blk_queue_max_hw_sectors(q, t->limits.max_hw_sectors);

	blk_queue_segment_boundary(q, t->limits.seg_boundary_mask);

	blk_queue_bounce_pfn(q, t->limits.bounce_pfn);

	blk_queue_bounce_limit(q, t->limits.bounce_pfn);



	if (t->limits.no_cluster)

		queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -910,7 +910,6 @@ extern struct request_queue *blk_init_queue(request_fn_proc *, spinlock_t *); 
extern void blk_cleanup_queue(struct request_queue *);

extern void blk_queue_make_request(struct request_queue *, make_request_fn *);

extern void blk_queue_bounce_limit(struct request_queue *, u64);

extern void blk_queue_bounce_pfn(struct request_queue *, u64);

extern void blk_queue_max_sectors(struct request_queue *, unsigned int);

extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int);

extern void blk_queue_max_phys_segments(struct request_queue *, unsigned short);