redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

remove sglist_len 

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
wifi-calibration
FUJITA Tomonori 2007-09-18 12:17:28 +02:00 committed by Jens Axboe
parent 8889e3c129
commit 2a7c59e79c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/scsi_lib.c
View File

@ -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);
}

1
include/scsi/scsi_cmnd.h
View File

@ -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