diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2007-02-12 03:53:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:48:36 -0500 |
commit | 27459f0940e16c68e080f5fc7e85aa9eb3f74528 (patch) | |
tree | f13cd1f2005dda2b6115e2afbc49e1271b0d374b /fs/lockd/svcproc.c | |
parent | 2442222283918c2d1c20ae651d95fe168757938b (diff) |
[PATCH] knfsd: SUNRPC: Provide room in svc_rqst for larger addresses
Expand the rq_addr field to allow it to contain larger addresses.
Specifically, we replace a 'sockaddr_in' with a 'sockaddr_storage', then
everywhere the 'sockaddr_in' was referenced, we use instead an accessor
function (svc_addr_in) which safely casts the _storage to _in.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/lockd/svcproc.c')
-rw-r--r-- | fs/lockd/svcproc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index f590304d93b..31cb4842573 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
@@ -253,7 +253,7 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
253 | resp->cookie = argp->cookie; | 253 | resp->cookie = argp->cookie; |
254 | 254 | ||
255 | dprintk("lockd: GRANTED called\n"); | 255 | dprintk("lockd: GRANTED called\n"); |
256 | resp->status = nlmclnt_grant(&rqstp->rq_addr, &argp->lock); | 256 | resp->status = nlmclnt_grant(svc_addr_in(rqstp), &argp->lock); |
257 | dprintk("lockd: GRANTED status %d\n", ntohl(resp->status)); | 257 | dprintk("lockd: GRANTED status %d\n", ntohl(resp->status)); |
258 | return rpc_success; | 258 | return rpc_success; |
259 | } | 259 | } |
@@ -452,7 +452,9 @@ static __be32 | |||
452 | nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, | 452 | nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp, |
453 | void *resp) | 453 | void *resp) |
454 | { | 454 | { |
455 | struct sockaddr_in saddr = rqstp->rq_addr; | 455 | struct sockaddr_in saddr; |
456 | |||
457 | memcpy(&saddr, svc_addr_in(rqstp), sizeof(saddr)); | ||
456 | 458 | ||
457 | dprintk("lockd: SM_NOTIFY called\n"); | 459 | dprintk("lockd: SM_NOTIFY called\n"); |
458 | if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK) | 460 | if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK) |