Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 7 insertions, 6 deletions

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index f67146a8199a..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,15 +421,16 @@ 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)
          || ntohs(saddr.sin_port) >= 1024) {
-                printk(KERN_WARNING
-                        "lockd: rejected NSM callback from %08x:%d\n",
-                        ntohl(rqstp->rq_addr.sin_addr.s_addr),
-                        ntohs(rqstp->rq_addr.sin_port));
+                char buf[RPC_MAX_ADDRBUFLEN];
+                printk(KERN_WARNING "lockd: rejected NSM callback from %s\n",
+                                svc_print_addr(rqstp, buf, sizeof(buf)));
                 return rpc_system_err;
         }