Commit bdf8710d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: move dma_pad handling from blk_rq_map_sg into the callers 



There are only two callers of blk_rq_map_sg/__blk_rq_map_sg that set
the dma_pad value in the queue.  Move the handling into those callers
instead of burdening the common code, and move the ->extra_len field
from struct request to struct scsi_cmnd.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cc97923a

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,6 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, 
	}

	rq->nr_phys_segments = rq_src->nr_phys_segments;

	rq->ioprio = rq_src->ioprio;

	rq->extra_len = rq_src->extra_len;



	return 0;

block/blk-merge.c

+0 −8
Original line number Diff line number Diff line
@@ -531,14 +531,6 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq, 
	else if (rq->bio)

		nsegs = __blk_bios_map_sg(q, rq->bio, sglist, last_sg);



	if (blk_rq_bytes(rq) && (blk_rq_bytes(rq) & q->dma_pad_mask)) {

		unsigned int pad_len =

			(q->dma_pad_mask & ~blk_rq_bytes(rq)) + 1;



		(*last_sg)->length += pad_len;

		rq->extra_len += pad_len;

	}



	if (*last_sg)

		sg_mark_end(*last_sg);

block/blk-mq.c

+0 −1
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static struct request *blk_mq_rq_ctx_init(struct blk_mq_alloc_data *data, 
	rq->nr_integrity_segments = 0;

#endif

	/* tag was already set */

	rq->extra_len = 0;

	WRITE_ONCE(rq->deadline, 0);



	rq->timeout = 0;

drivers/ata/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc) 
{

	struct scsi_cmnd *scmd = qc->scsicmd;



	qc->extrabytes = scmd->request->extra_len;

	qc->extrabytes = scmd->extra_len;

	qc->nbytes = scsi_bufflen(scmd) + qc->extrabytes;

}

drivers/ide/ide-io.c

+5 −2
Original line number Diff line number Diff line
@@ -233,10 +233,13 @@ static ide_startstop_t do_special(ide_drive_t *drive) 
void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct scatterlist *sg = hwif->sg_table;

	struct scatterlist *sg = hwif->sg_table, *last_sg = NULL;

	struct request *rq = cmd->rq;



	cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);

	cmd->sg_nents = __blk_rq_map_sg(drive->queue, rq, sg, &last_sg);

	if (blk_rq_bytes(rq) && (blk_rq_bytes(rq) & rq->q->dma_pad_mask))

		last_sg->length +=

			(rq->q->dma_pad_mask & ~blk_rq_bytes(rq)) + 1;

}

EXPORT_SYMBOL_GPL(ide_map_sg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE