lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

Browse Source 
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  [BLOCK] blk_rq_map_sg() next_sg fixup
  Revert "[SCSI] Remove full sg table memset()"
This commit is contained in:
Linus Torvalds
2007-10-17 11:56:06 -07:00
parent fb9fc39517 ba951841ce
commit c56ec76392
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
block/ll_rw_blk.c
View File

@@ -1322,8 +1322,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
struct scatterlist *sglist) struct scatterlist *sglist)
{ {
struct bio_vec *bvec, *bvprv; struct bio_vec *bvec, *bvprv;
struct scatterlist *next_sg, *sg;
struct req_iterator iter; struct req_iterator iter;
struct scatterlist *sg;
int nsegs, cluster; int nsegs, cluster;
nsegs = 0; nsegs = 0;
@@ -1333,7 +1333,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
* for each bio in rq * for each bio in rq
*/ */
bvprv = NULL; bvprv = NULL;
sg = next_sg = &sglist[0]; sg = NULL;
rq_for_each_segment(bvec, rq, iter) { rq_for_each_segment(bvec, rq, iter) {
int nbytes = bvec->bv_len; int nbytes = bvec->bv_len;
@@ -1349,8 +1349,10 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
sg->length += nbytes; sg->length += nbytes;
} else { } else {
new_segment: new_segment:
sg = next_sg; if (!sg)
next_sg = sg_next(sg); sg = sglist;
else
sg = sg_next(sg);
memset(sg, 0, sizeof(*sg)); memset(sg, 0, sizeof(*sg));
sg->page = bvec->bv_page; sg->page = bvec->bv_page;

2
drivers/scsi/scsi_lib.c
View File

@@ -764,6 +764,8 @@ struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *cmd, gfp_t gfp_mask)
if (unlikely(!sgl)) if (unlikely(!sgl))
goto enomem; goto enomem;
memset(sgl, 0, sizeof(*sgl) * sgp->size);
/* /*
* first loop through, set initial index and return value * first loop through, set initial index and return value
*/ */