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

Commit 22cc3d4c authored by Ming Lin's avatar Ming Lin Committed by Martin K. Petersen
Browse files

scsi: replace "mq" with "first_chunk" in SG functions 



Parameter "bool mq" is block driver specific.
Change it to "first_chunk" to make it more generic.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 91dbc08d

drivers/scsi/scsi_lib.c

+10 −10
Original line number Diff line number Diff line
@@ -583,33 +583,32 @@ static struct scatterlist *scsi_sg_alloc(unsigned int nents, gfp_t gfp_mask) 
	return mempool_alloc(sgp->pool, gfp_mask);

}



static void scsi_free_sgtable(struct sg_table *table, bool mq)

static void scsi_free_sgtable(struct sg_table *table, bool first_chunk)

{

	if (mq && table->orig_nents <= SCSI_MAX_SG_SEGMENTS)

	if (first_chunk && table->orig_nents <= SCSI_MAX_SG_SEGMENTS)

		return;

	__sg_free_table(table, SCSI_MAX_SG_SEGMENTS, mq, scsi_sg_free);

	__sg_free_table(table, SCSI_MAX_SG_SEGMENTS, first_chunk, scsi_sg_free);

}



static int scsi_alloc_sgtable(struct sg_table *table, int nents, bool mq)

static int scsi_alloc_sgtable(struct sg_table *table, int nents,

		struct scatterlist *first_chunk)

{

	struct scatterlist *first_chunk = NULL;

	int ret;



	BUG_ON(!nents);



	if (mq) {

	if (first_chunk) {

		if (nents <= SCSI_MAX_SG_SEGMENTS) {

			table->nents = table->orig_nents = nents;

			sg_init_table(table->sgl, nents);

			return 0;

		}

		first_chunk = table->sgl;

	}



	ret = __sg_alloc_table(table, nents, SCSI_MAX_SG_SEGMENTS,

			       first_chunk, GFP_ATOMIC, scsi_sg_alloc);

	if (unlikely(ret))

		scsi_free_sgtable(table, mq);

		scsi_free_sgtable(table, (bool)first_chunk);

	return ret;

}
@@ -1091,7 +1090,7 @@ static int scsi_init_sgtable(struct request *req, struct scsi_data_buffer *sdb) 
	 * If sg table allocation fails, requeue request later.

	 */

	if (unlikely(scsi_alloc_sgtable(&sdb->table, req->nr_phys_segments,

					req->mq_ctx != NULL)))

					sdb->table.sgl)))

		return BLKPREP_DEFER;



	/*
@@ -1163,7 +1162,8 @@ int scsi_init_io(struct scsi_cmnd *cmd) 


		ivecs = blk_rq_count_integrity_sg(rq->q, rq->bio);



		if (scsi_alloc_sgtable(&prot_sdb->table, ivecs, is_mq)) {

		if (scsi_alloc_sgtable(&prot_sdb->table, ivecs,

				prot_sdb->table.sgl)) {

			error = BLKPREP_DEFER;

			goto err_exit;

		}