diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 14:44:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-11 14:44:59 -0500 |
| commit | b506d1b6c49a5884ff67a29bc99a1912ee20acee (patch) | |
| tree | 0c7734b5cb859d62720c18afdf3fe144b5cce5ff /include | |
| parent | 646fd12784d506180353005f40f90bcf08c84a3e (diff) | |
| parent | 11a57153e3377ffdf8cfca2eda9a99063f66b957 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
blktrace: kill the unneeded initcall
block: fix blktrace timestamps
loop: fix bad bio_alloc() nr_iovec request
Don't blatt first element of prv in sg_chain()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/scatterlist.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h index 416e000dfe81..e3ff21dbac53 100644 --- a/include/linux/scatterlist.h +++ b/include/linux/scatterlist.h | |||
| @@ -191,8 +191,8 @@ static inline void sg_chain(struct scatterlist *prv, unsigned int prv_nents, | |||
| 191 | /* | 191 | /* |
| 192 | * offset and length are unused for chain entry. Clear them. | 192 | * offset and length are unused for chain entry. Clear them. |
| 193 | */ | 193 | */ |
| 194 | prv->offset = 0; | 194 | prv[prv_nents - 1].offset = 0; |
| 195 | prv->length = 0; | 195 | prv[prv_nents - 1].length = 0; |
| 196 | 196 | ||
| 197 | /* | 197 | /* |
| 198 | * Set lowest bit to indicate a link pointer, and make sure to clear | 198 | * Set lowest bit to indicate a link pointer, and make sure to clear |