diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-22 13:44:26 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-22 15:19:56 -0400 |
commit | fa05f1286be25a8ce915c5dd492aea61126b3f33 (patch) | |
tree | 07d6d32733f3272d588410a64c0cfa25d794e3be /net/sunrpc | |
parent | 60c74f81933635bb4ccb4ee6f31909c51f5cd230 (diff) |
Update net/ to use sg helpers
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_crypto.c | 10 | ||||
-rw-r--r-- | net/sunrpc/xdr.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c index bfb6a29633dd..32be431affcf 100644 --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c | |||
@@ -197,9 +197,9 @@ encryptor(struct scatterlist *sg, void *data) | |||
197 | int i = (page_pos + outbuf->page_base) >> PAGE_CACHE_SHIFT; | 197 | int i = (page_pos + outbuf->page_base) >> PAGE_CACHE_SHIFT; |
198 | in_page = desc->pages[i]; | 198 | in_page = desc->pages[i]; |
199 | } else { | 199 | } else { |
200 | in_page = sg->page; | 200 | in_page = sg_page(sg); |
201 | } | 201 | } |
202 | desc->infrags[desc->fragno].page = in_page; | 202 | sg_set_page(&desc->infrags[desc->fragno], in_page); |
203 | desc->fragno++; | 203 | desc->fragno++; |
204 | desc->fraglen += sg->length; | 204 | desc->fraglen += sg->length; |
205 | desc->pos += sg->length; | 205 | desc->pos += sg->length; |
@@ -215,11 +215,11 @@ encryptor(struct scatterlist *sg, void *data) | |||
215 | if (ret) | 215 | if (ret) |
216 | return ret; | 216 | return ret; |
217 | if (fraglen) { | 217 | if (fraglen) { |
218 | desc->outfrags[0].page = sg->page; | 218 | sg_set_page(&desc->outfrags[0], sg_page(sg)); |
219 | desc->outfrags[0].offset = sg->offset + sg->length - fraglen; | 219 | desc->outfrags[0].offset = sg->offset + sg->length - fraglen; |
220 | desc->outfrags[0].length = fraglen; | 220 | desc->outfrags[0].length = fraglen; |
221 | desc->infrags[0] = desc->outfrags[0]; | 221 | desc->infrags[0] = desc->outfrags[0]; |
222 | desc->infrags[0].page = in_page; | 222 | sg_set_page(&desc->infrags[0], in_page); |
223 | desc->fragno = 1; | 223 | desc->fragno = 1; |
224 | desc->fraglen = fraglen; | 224 | desc->fraglen = fraglen; |
225 | } else { | 225 | } else { |
@@ -287,7 +287,7 @@ decryptor(struct scatterlist *sg, void *data) | |||
287 | if (ret) | 287 | if (ret) |
288 | return ret; | 288 | return ret; |
289 | if (fraglen) { | 289 | if (fraglen) { |
290 | desc->frags[0].page = sg->page; | 290 | sg_set_page(&desc->frags[0], sg_page(sg)); |
291 | desc->frags[0].offset = sg->offset + sg->length - fraglen; | 291 | desc->frags[0].offset = sg->offset + sg->length - fraglen; |
292 | desc->frags[0].length = fraglen; | 292 | desc->frags[0].length = fraglen; |
293 | desc->fragno = 1; | 293 | desc->fragno = 1; |
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 6a59180e1667..3d1f7cdf9dd0 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
@@ -1059,7 +1059,7 @@ xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len, | |||
1059 | do { | 1059 | do { |
1060 | if (thislen > page_len) | 1060 | if (thislen > page_len) |
1061 | thislen = page_len; | 1061 | thislen = page_len; |
1062 | sg->page = buf->pages[i]; | 1062 | sg_set_page(sg, buf->pages[i]); |
1063 | sg->offset = page_offset; | 1063 | sg->offset = page_offset; |
1064 | sg->length = thislen; | 1064 | sg->length = thislen; |
1065 | ret = actor(sg, data); | 1065 | ret = actor(sg, data); |