Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3383977f authored by ike Snitzer's avatar ike Snitzer Committed by Jens Axboe
Browse files

block: update request stacking methods to support discards 



Propagate REQ_DISCARD in cmd_flags when cloning a discard request.
Skip blk_rq_check_limits's existing checks for discard requests because
discard limits will have already been checked in blkdev_issue_discard.

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 387ac089

block/blk-core.c

+5 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,9 @@ EXPORT_SYMBOL(submit_bio); 
 */

int blk_rq_check_limits(struct request_queue *q, struct request *rq)

{

	if (rq->cmd_flags & REQ_DISCARD)

		return 0;



	if (blk_rq_sectors(rq) > queue_max_sectors(q) ||

	    blk_rq_bytes(rq) > queue_max_hw_sectors(q) << 9) {

		printk(KERN_ERR "%s: over max size limit.\n", __func__);
@@ -2492,6 +2495,8 @@ static void __blk_rq_prep_clone(struct request *dst, struct request *src) 
{

	dst->cpu = src->cpu;

	dst->cmd_flags = (rq_data_dir(src) | REQ_NOMERGE);

	if (src->cmd_flags & REQ_DISCARD)

		dst->cmd_flags |= REQ_DISCARD;

	dst->cmd_type = src->cmd_type;

	dst->__sector = blk_rq_pos(src);

	dst->__data_len = blk_rq_bytes(src);