diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:08:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:08:13 -0400 |
| commit | b6257a9036f06878a0f02354d5a07f155e1cfee0 (patch) | |
| tree | c0e12e3568199b748ebc7c1f9cf4005ae5da5f36 /block | |
| parent | c548f08a4f7b89b93c805e0c4024b8302afa7121 (diff) | |
| parent | f5c0dde4c66421a3a2d7d6fa604a712c9b0744e5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
[SCSI] Remove full sg table memset()
[SCSI] ide-scsi: remove usage of sg_last()
Fix loop terminating conditions in fill_sg().
[BLOCK] Clear sg entry before filling in blk_rq_map_sg()
IA64: iommu uses sg_next with an invalid sg element
cciss: disable DMA refetch on Smart Array P600
swiotlb: fix map_sg failure handling
SPARC64: fix iommu sg chaining
[SCSI] ide-scsi: use scsi_sg_count() instead of ->use_sg
Diffstat (limited to 'block')
| -rw-r--r-- | block/ll_rw_blk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 524404bd08c1..9e3f3cc85d0d 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
| @@ -1352,6 +1352,7 @@ new_segment: | |||
| 1352 | sg = next_sg; | 1352 | sg = next_sg; |
| 1353 | next_sg = sg_next(sg); | 1353 | next_sg = sg_next(sg); |
| 1354 | 1354 | ||
| 1355 | memset(sg, 0, sizeof(*sg)); | ||
| 1355 | sg->page = bvec->bv_page; | 1356 | sg->page = bvec->bv_page; |
| 1356 | sg->length = nbytes; | 1357 | sg->length = nbytes; |
| 1357 | sg->offset = bvec->bv_offset; | 1358 | sg->offset = bvec->bv_offset; |