diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:10:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:10:40 -0700 |
| commit | 0f5a2c553d1484141ebb369ecab61894e9cb074f (patch) | |
| tree | ba7667fb37832e1714dc2a8b3b3e45dade4af5cb /fs/ecryptfs/crypto.c | |
| parent | 26adc0d5859788b74f86677538236f807e6d9021 (diff) | |
| parent | 68e3f5dd4db62619fdbe520d36c9ebf62e672256 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[CRYPTO] users: Fix up scatterlist conversion errors
[CRYPTO] tcrypt: Move sg_init_table out of timing loops
[NETNS]: Fix get_net_ns_by_pid
[NET]: Marking struct pernet_operations __net_initdata was inappropriate
[INET] ESP: Must #include <linux/scatterlist.h>
[TCP] IPV6: fix softnet build breakage
Diffstat (limited to 'fs/ecryptfs/crypto.c')
| -rw-r--r-- | fs/ecryptfs/crypto.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c index 7a472b12999..9d70289f7df 100644 --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -279,6 +279,8 @@ int virt_to_scatterlist(const void *addr, int size, struct scatterlist *sg, int offset; int remainder_of_page; + sg_init_table(sg, sg_size); + while (size > 0 && i < sg_size) { pg = virt_to_page(addr); offset = offset_in_page(addr); |