7 files changed, 22 insertions, 18 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 3d4610c2a266..22d403208973 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -192,7 +192,7 @@ struct nlm_host *
 nlmsvc_lookup_host(struct svc_rqst *rqstp,
                         const char *hostname, int hostname_len)
 {
-        return nlm_lookup_host(1, &rqstp->rq_addr,
+        return nlm_lookup_host(1, svc_addr_in(rqstp),
                                rqstp->rq_prot, rqstp->rq_vers,
                                hostname, hostname_len);
 }
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index 9b591bc18341..47a66aa5d55b 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -224,7 +224,7 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp,
         resp->cookie = argp->cookie;
 
         dprintk("lockd: GRANTED       called\n");
-        resp->status = nlmclnt_grant(&rqstp->rq_addr, &argp->lock);
+        resp->status = nlmclnt_grant(svc_addr_in(rqstp), &argp->lock);
         dprintk("lockd: GRANTED       status %d\n", ntohl(resp->status));
         return rpc_success;
 }
@@ -421,7 +421,9 @@ static __be32
 nlm4svc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
                                               void              *resp)
 {
-        struct sockaddr_in      saddr = rqstp->rq_addr;
+        struct sockaddr_in      saddr;
+
+        memcpy(&saddr, svc_addr_in(rqstp), sizeof(saddr));
 
         dprintk("lockd: SM_NOTIFY     called\n");
         if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index f590304d93bf..31cb48425733 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,
         resp->cookie = argp->cookie;
 
         dprintk("lockd: GRANTED       called\n");
-        resp->status = nlmclnt_grant(&rqstp->rq_addr, &argp->lock);
+        resp->status = nlmclnt_grant(svc_addr_in(rqstp), &argp->lock);
         dprintk("lockd: GRANTED       status %d\n", ntohl(resp->status));
         return rpc_success;
 }
@@ -452,7 +452,9 @@ static __be32
 nlmsvc_proc_sm_notify(struct svc_rqst *rqstp, struct nlm_reboot *argp,
                                               void              *resp)
 {
-        struct sockaddr_in      saddr = rqstp->rq_addr;
+        struct sockaddr_in      saddr;
+
+        memcpy(&saddr, svc_addr_in(rqstp), sizeof(saddr));
 
         dprintk("lockd: SM_NOTIFY     called\n");
         if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 8c790af85984..75f309c8741a 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -166,7 +166,7 @@ void nfs_callback_down(void)
 
 static int nfs_callback_authenticate(struct svc_rqst *rqstp)
 {
-        struct sockaddr_in *addr = &rqstp->rq_addr;
+        struct sockaddr_in *addr = svc_addr_in(rqstp);
         struct nfs_client *clp;
         char buf[RPC_MAX_ADDRBUFLEN];
 
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index f8ea1f51f590..849a2029975d 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -176,7 +176,7 @@ static __be32 decode_getattr_args(struct svc_rqst *rqstp, struct xdr_stream *xdr
         status = decode_fh(xdr, &args->fh);
         if (unlikely(status != 0))
                 goto out;
-        args->addr = &rqstp->rq_addr;
+        args->addr = svc_addr_in(rqstp);
         status = decode_bitmap(xdr, args->bitmap);
 out:
         dprintk("%s: exit with status = %d\n", __FUNCTION__, status);
@@ -188,7 +188,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr,
         __be32 *p;
         __be32 status;
 
-        args->addr = &rqstp->rq_addr;
+        args->addr = svc_addr_in(rqstp);
         status = decode_stateid(xdr, &args->stateid);
         if (unlikely(status != 0))
                 goto out;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 9de89df961f4..9e4067999209 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -714,7 +714,7 @@ __be32
 nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                   struct nfsd4_setclientid *setclid)
 {
-        __be32                  ip_addr = rqstp->rq_addr.sin_addr.s_addr;
+        struct sockaddr_in      *sin = svc_addr_in(rqstp);
         struct xdr_netobj       clname = { 
                 .len = setclid->se_namelen,
                 .data = setclid->se_name,
@@ -749,7 +749,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                  */
                 status = nfserr_clid_inuse;
                 if (!cmp_creds(&conf->cl_cred, &rqstp->rq_cred)
-                                || conf->cl_addr != ip_addr) {
+                                || conf->cl_addr != sin->sin_addr.s_addr) {
                         printk("NFSD: setclientid: string in use by client"
                         "(clientid %08x/%08x)\n",
                         conf->cl_clientid.cl_boot, conf->cl_clientid.cl_id);
@@ -769,7 +769,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 if (new == NULL)
                         goto out;
                 copy_verf(new, &clverifier);
-                new->cl_addr = ip_addr;
+                new->cl_addr = sin->sin_addr.s_addr;
                 copy_cred(&new->cl_cred,&rqstp->rq_cred);
                 gen_clid(new);
                 gen_confirm(new);
@@ -801,7 +801,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 if (new == NULL)
                         goto out;
                 copy_verf(new,&conf->cl_verifier);
-                new->cl_addr = ip_addr;
+                new->cl_addr = sin->sin_addr.s_addr;
                 copy_cred(&new->cl_cred,&rqstp->rq_cred);
                 copy_clid(new, conf);
                 gen_confirm(new);
@@ -820,7 +820,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 if (new == NULL)
                         goto out;
                 copy_verf(new,&clverifier);
-                new->cl_addr = ip_addr;
+                new->cl_addr = sin->sin_addr.s_addr;
                 copy_cred(&new->cl_cred,&rqstp->rq_cred);
                 gen_clid(new);
                 gen_confirm(new);
@@ -847,7 +847,7 @@ nfsd4_setclientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
                 if (new == NULL)
                         goto out;
                 copy_verf(new,&clverifier);
-                new->cl_addr = ip_addr;
+                new->cl_addr = sin->sin_addr.s_addr;
                 copy_cred(&new->cl_cred,&rqstp->rq_cred);
                 gen_clid(new);
                 gen_confirm(new);
@@ -881,7 +881,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
                          struct nfsd4_compound_state *cstate,
                          struct nfsd4_setclientid_confirm *setclientid_confirm)
 {
-        __be32 ip_addr = rqstp->rq_addr.sin_addr.s_addr;
+        struct sockaddr_in *sin = svc_addr_in(rqstp);
         struct nfs4_client *conf, *unconf;
         nfs4_verifier confirm = setclientid_confirm->sc_confirm; 
         clientid_t * clid = &setclientid_confirm->sc_clientid;
@@ -900,9 +900,9 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
         unconf = find_unconfirmed_client(clid);
 
         status = nfserr_clid_inuse;
-        if (conf && conf->cl_addr != ip_addr)
+        if (conf && conf->cl_addr != sin->sin_addr.s_addr)
                 goto out;
-        if (unconf && unconf->cl_addr != ip_addr)
+        if (unconf && unconf->cl_addr != sin->sin_addr.s_addr)
                 goto out;
 
         if ((conf && unconf) && 
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
index f90d70475854..578f2c9d56be 100644
--- a/fs/nfsd/nfscache.c
+++ b/fs/nfsd/nfscache.c
@@ -185,7 +185,7 @@ nfsd_cache_lookup(struct svc_rqst *rqstp, int type)
         rp->c_state = RC_INPROG;
         rp->c_xid = xid;
         rp->c_proc = proc;
-        rp->c_addr = rqstp->rq_addr;
+        memcpy(&rp->c_addr, svc_addr_in(rqstp), sizeof(rp->c_addr));
         rp->c_prot = proto;
         rp->c_vers = vers;
         rp->c_timestamp = jiffies;