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

Commit 2a7c59e7 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

remove sglist_len 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 8889e3c1

drivers/scsi/scsi_lib.c

+4 −7
Original line number Diff line number Diff line
@@ -769,10 +769,8 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask) 
		/*

		 * first loop through, set initial index and return value

		 */

		if (!ret) {

			cmd->sglist_len = index;

		if (!ret)

			ret = sgl;

		}



		/*

		 * chain previous sglist, if any. we know the previous
@@ -825,8 +823,6 @@ void scsi_free_sgtable(struct scsi_cmnd *cmd) 
	struct scatterlist *sgl = cmd->request_buffer;

	struct scsi_host_sg_pool *sgp;



	BUG_ON(cmd->sglist_len >= SG_MEMPOOL_NR);



	/*

	 * if this is the biggest size sglist, check if we have

	 * chained parts we need to free
@@ -861,9 +857,10 @@ void scsi_free_sgtable(struct scsi_cmnd *cmd) 
		 * Restore original, will be freed below

		 */

		sgl = cmd->request_buffer;

	}

		sgp = scsi_sg_pools + SG_MEMPOOL_NR - 1;

	} else

		sgp = scsi_sg_pools + scsi_sgtable_index(cmd->__use_sg);



	sgp = scsi_sg_pools + cmd->sglist_len;

	mempool_free(sgl, sgp->pool);

}

include/scsi/scsi_cmnd.h

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct scsi_cmnd { 


	/* These elements define the operation we ultimately want to perform */

	unsigned short use_sg;	/* Number of pieces of scatter-gather */

	unsigned short sglist_len;	/* size of malloc'd scatter-gather list */

	unsigned short __use_sg;



	unsigned underflow;	/* Return error if less than