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.

22 files changed, 414 insertions, 262 deletions

diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c
index 5752f294751..9527f2bb174 100644
--- a/net/sunrpc/auth.c
+++ b/net/sunrpc/auth.c
@@ -213,7 +213,7 @@ retry:
                 rpcauth_gc_credcache(auth, &free);
         hlist_for_each_safe(pos, next, &cache->hashtable[nr]) {
                 struct rpc_cred *entry;
-                entry = hlist_entry(pos, struct rpc_cred, cr_hash);
+                entry = hlist_entry(pos, struct rpc_cred, cr_hash);
                 if (entry->cr_ops->crmatch(acred, entry, flags)) {
                         hlist_del(&entry->cr_hash);
                         cred = entry;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index 2fe8e91f5bc..4e4ccc5b6fe 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -2,7 +2,7 @@
  * linux/net/sunrpc/auth_gss/auth_gss.c
  *
  * RPCSEC_GSS client authentication.
- * 
+ *
  *  Copyright (c) 2000 The Regents of the University of Michigan.
  *  All rights reserved.
  *
@@ -74,7 +74,7 @@ static struct rpc_credops gss_credops;
 * as it is passed to gssd to signal the use of
 * machine creds should be part of the shared rpc interface */
 
-#define CA_RUN_AS_MACHINE  0x00000200 
+#define CA_RUN_AS_MACHINE  0x00000200
 
 /* dump the buffer in `emacs-hexl' style */
 #define isprint(c)      ((c > 0x1f) && (c < 0x7f))
@@ -609,8 +609,8 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg)
         }
 }
 
-/* 
- * NOTE: we have the opportunity to use different 
+/*
+ * NOTE: we have the opportunity to use different
  * parameters based on the input flavor (which must be a pseudoflavor)
  */
 static struct rpc_auth *
@@ -871,7 +871,7 @@ gss_validate(struct rpc_task *task, __be32 *p)
 
         flav = ntohl(*p++);
         if ((len = ntohl(*p++)) > RPC_MAX_AUTH_SIZE)
-                goto out_bad;
+                goto out_bad;
         if (flav != RPC_AUTH_GSS)
                 goto out_bad;
         seq = htonl(task->tk_rqstp->rq_seqno);
@@ -927,7 +927,7 @@ gss_wrap_req_integ(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
         *integ_len = htonl(integ_buf.len);
 
         /* guess whether we're in the head or the tail: */
-        if (snd_buf->page_len || snd_buf->tail[0].iov_len) 
+        if (snd_buf->page_len || snd_buf->tail[0].iov_len)
                 iov = snd_buf->tail;
         else
                 iov = snd_buf->head;
@@ -1032,7 +1032,7 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx,
         maj_stat = gss_wrap(ctx->gc_gss_ctx, offset, snd_buf, inpages);
         /* RPC_SLACK_SPACE should prevent this ever happening: */
         BUG_ON(snd_buf->len > snd_buf->buflen);
-        status = -EIO;
+        status = -EIO;
         /* We're assuming that when GSS_S_CONTEXT_EXPIRED, the encryption was
          * done anyway, so it's safe to put the request on the wire: */
         if (maj_stat == GSS_S_CONTEXT_EXPIRED)
@@ -1081,7 +1081,7 @@ gss_wrap_req(struct rpc_task *task,
                         status = gss_wrap_req_integ(cred, ctx, encode,
                                                                 rqstp, p, obj);
                         break;
-                case RPC_GSS_SVC_PRIVACY:
+                case RPC_GSS_SVC_PRIVACY:
                         status = gss_wrap_req_priv(cred, ctx, encode,
                                         rqstp, p, obj);
                         break;
@@ -1181,7 +1181,7 @@ gss_unwrap_resp(struct rpc_task *task,
                         if (status)
                                 goto out;
                         break;
-                case RPC_GSS_SVC_PRIVACY:
+                case RPC_GSS_SVC_PRIVACY:
                         status = gss_unwrap_resp_priv(cred, ctx, rqstp, &p);
                         if (status)
                                 goto out;
@@ -1198,7 +1198,7 @@ out:
                         status);
         return status;
 }
-  
+
 static struct rpc_authops authgss_ops = {
         .owner          = THIS_MODULE,
         .au_flavor      = RPC_AUTH_GSS,
diff --git a/net/sunrpc/auth_gss/gss_generic_token.c b/net/sunrpc/auth_gss/gss_generic_token.c
index 826df44e7fc..ea8c92ecdae 100644
--- a/net/sunrpc/auth_gss/gss_generic_token.c
+++ b/net/sunrpc/auth_gss/gss_generic_token.c
@@ -11,7 +11,7 @@
 
 /*
  * Copyright 1993 by OpenVision Technologies, Inc.
- * 
+ *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without fee,
  * provided that the above copyright notice appears in all copies and
@@ -21,7 +21,7 @@
  * without specific, written prior permission. OpenVision makes no
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
- * 
+ *
  * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -201,7 +201,7 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,
                 return(G_BAD_TOK_HEADER);
         if (*buf++ != 0x06)
                 return(G_BAD_TOK_HEADER);
- 
+
         if ((toksize-=1) < 0)
                 return(G_BAD_TOK_HEADER);
         toid.len = *buf++;
@@ -211,9 +211,9 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,
         toid.data = buf;
         buf+=toid.len;
 
-        if (! g_OID_equal(&toid, mech)) 
+        if (! g_OID_equal(&toid, mech))
                 ret = G_WRONG_MECH;
- 
+
    /* G_WRONG_MECH is not returned immediately because it's more important
       to return G_BAD_TOK_HEADER if the token header is in fact bad */
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index cd64efd5921..f441aa0b26d 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -58,7 +58,7 @@ krb5_encrypt(
         int length)
 {
         u32 ret = -EINVAL;
-        struct scatterlist sg[1];
+        struct scatterlist sg[1];
         u8 local_iv[16] = {0};
         struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv };
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_seqnum.c b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
index 2f0b1125701..43f3421f1e6 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seqnum.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seqnum.c
@@ -11,7 +11,7 @@
 
 /*
  * Copyright 1993 by OpenVision Technologies, Inc.
- * 
+ *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without fee,
  * provided that the above copyright notice appears in all copies and
@@ -21,7 +21,7 @@
  * without specific, written prior permission. OpenVision makes no
  * representations about the suitability of this software for any
  * purpose.  It is provided "as is" without express or implied warranty.
- * 
+ *
  * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
  * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index c7681db96fb..26872517ccf 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -6,14 +6,14 @@
  *
  *  J. Bruce Fields   <bfields@umich.edu>
  *
- *  Redistribution and use in source and binary forms, with or without 
+ *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the 
+ *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *  3. Neither the name of the University nor the names of its
  *     contributors may be used to endorse or promote products derived
diff --git a/net/sunrpc/auth_gss/gss_spkm3_token.c b/net/sunrpc/auth_gss/gss_spkm3_token.c
index 156413ae6ca..6cdd241ad26 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_token.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_token.c
@@ -59,7 +59,7 @@ asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits)
 
         /* count trailing 0's */
         for(i = in->len; i > 0; i--) {
-                if (*ptr == 0) { 
+                if (*ptr == 0) {
                         ptr--;
                         elen--;
                 } else
@@ -82,7 +82,7 @@ asn1_bitstring_len(struct xdr_netobj *in, int *enclen, int *zerobits)
 
 /*
  * decode_asn1_bitstring()
- * 
+ *
  * decode a bitstring into a buffer of the expected length.
  * enclen = bit string length
  * explen = expected length (define in rfc)
@@ -97,9 +97,9 @@ decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
         return 1;
 }
 
-/* 
+/*
  * SPKMInnerContextToken choice SPKM_MIC asn1 token layout
- * 
+ *
  * contextid is always 16 bytes plain data. max asn1 bitstring len = 17.
  *
  * tokenlen = pos[0] to end of token (max pos[45] with MD5 cksum)
@@ -107,21 +107,21 @@ decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
  * pos  value
  * ----------
  * [0]  a4  SPKM-MIC tag
- * [1]  ??  innertoken length  (max 44) 
- * 
- * 
- * tok_hdr piece of checksum data starts here 
+ * [1]  ??  innertoken length  (max 44)
+ *
+ *
+ * tok_hdr piece of checksum data starts here
  *
- * the maximum mic-header len = 9 + 17 = 26 
+ * the maximum mic-header len = 9 + 17 = 26
  *      mic-header
  *      ----------
- * [2]  30      SEQUENCE tag  
- * [3]  ??      mic-header length: (max 23) = TokenID + ContextID 
+ * [2]  30      SEQUENCE tag
+ * [3]  ??      mic-header length: (max 23) = TokenID + ContextID
  *
  *              TokenID  - all fields constant and can be hardcoded
  *              -------
  * [4]    02    Type 2
- * [5]    02    Length 2 
+ * [5]    02    Length 2
  * [6][7] 01 01 TokenID (SPKM_MIC_TOK)
  *
  *              ContextID  - encoded length not constant, calculated
@@ -131,17 +131,17 @@ decode_asn1_bitstring(struct xdr_netobj *out, char *in, int enclen, int explen)
  * [10] ??      ctxzbit
  * [11]         contextid
  *
- * mic_header piece of checksum data ends here. 
+ * mic_header piece of checksum data ends here.
  *
  *      int-cksum - encoded length not constant, calculated
  *      ---------
  * [??] 03      Type 3
- * [??] ??      encoded length 
- * [??] ??      md5zbit         
+ * [??] ??      encoded length
+ * [??] ??      md5zbit
  * [??]         int-cksum (NID_md5 = 16)
  *
- * maximum SPKM-MIC innercontext token length = 
- *       10 + encoded contextid_size(17 max) + 2 + encoded  
+ * maximum SPKM-MIC innercontext token length =
+ *       10 + encoded contextid_size(17 max) + 2 + encoded
  *       cksum_size (17 maxfor NID_md5) = 46
  */
 
@@ -178,8 +178,8 @@ spkm3_mic_header(unsigned char **hdrbuf, unsigned int *hdrlen, unsigned char *ct
 /*
  * spkm3_mic_innercontext_token()
  *
- * *tokp points to the beginning of the SPKM_MIC token  described 
- * in rfc 2025, section 3.2.1: 
+ * *tokp points to the beginning of the SPKM_MIC token  described
+ * in rfc 2025, section 3.2.1:
  *
  * toklen is the inner token length
  */
@@ -245,9 +245,9 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
                 goto out;
 
         /*
-        * in the current implementation: the optional int-alg is not present 
-        * so the default int-alg (md5) is used the optional snd-seq field is 
-        * also not present 
+        * in the current implementation: the optional int-alg is not present
+        * so the default int-alg (md5) is used the optional snd-seq field is
+        * also not present
         */
 
         if (*mic_hdrlen != 6 + ctxelen) {
@@ -257,7 +257,7 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
                 goto out;
         }
         /* checksum */
-        *cksum = (&ptr[10] + ctxelen); /* ctxelen includes ptr[10] */
+        *cksum = (&ptr[10] + ctxelen); /* ctxelen includes ptr[10] */
 
         ret = GSS_S_COMPLETE;
 out:
diff --git a/net/sunrpc/auth_gss/gss_spkm3_unseal.c b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
index ac1ad6b1dc4..cc21ee860bb 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_unseal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
@@ -45,7 +45,7 @@
 
 /*
  * spkm3_read_token()
- * 
+ *
  * only SPKM_MIC_TOK with md5 intg-alg is supported
  */
 u32
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 8944cabcde5..db298b501c8 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -172,8 +172,8 @@ static struct cache_head *rsi_alloc(void)
 }
 
 static void rsi_request(struct cache_detail *cd,
-                       struct cache_head *h,
-                       char **bpp, int *blen)
+                       struct cache_head *h,
+                       char **bpp, int *blen)
 {
         struct rsi *rsii = container_of(h, struct rsi, h);
 
@@ -184,7 +184,7 @@ static void rsi_request(struct cache_detail *cd,
 
 
 static int rsi_parse(struct cache_detail *cd,
-                    char *mesg, int mlen)
+                    char *mesg, int mlen)
 {
         /* context token expiry major minor context token */
         char *buf = mesg;
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 9e72223487f..f02f24ae946 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -275,7 +275,7 @@ int cache_check(struct cache_detail *detail,
  *
  * A table is then only scanned if the current time is at least
  * the nextcheck time.
- * 
+ *
  */
 
 static LIST_HEAD(cache_list);
@@ -283,9 +283,9 @@ static DEFINE_SPINLOCK(cache_list_lock);
 static struct cache_detail *current_detail;
 static int current_index;
 
-static struct file_operations cache_file_operations;
-static struct file_operations content_file_operations;
-static struct file_operations cache_flush_operations;
+static const struct file_operations cache_file_operations;
+static const struct file_operations content_file_operations;
+static const struct file_operations cache_flush_operations;
 
 static void do_cache_clean(struct work_struct *work);
 static DECLARE_DELAYED_WORK(cache_cleaner, do_cache_clean);
@@ -297,16 +297,16 @@ void cache_register(struct cache_detail *cd)
                 struct proc_dir_entry *p;
                 cd->proc_ent->owner = cd->owner;
                 cd->channel_ent = cd->content_ent = NULL;
-                
-                p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR,
-                                      cd->proc_ent);
+
+                p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR,
+                                      cd->proc_ent);
                 cd->flush_ent =  p;
-                if (p) {
-                        p->proc_fops = &cache_flush_operations;
-                        p->owner = cd->owner;
-                        p->data = cd;
-                }
- 
+                if (p) {
+                        p->proc_fops = &cache_flush_operations;
+                        p->owner = cd->owner;
+                        p->data = cd;
+                }
+
                 if (cd->cache_request || cd->cache_parse) {
                         p = create_proc_entry("channel", S_IFREG|S_IRUSR|S_IWUSR,
                                               cd->proc_ent);
@@ -317,16 +317,16 @@ void cache_register(struct cache_detail *cd)
                                 p->data = cd;
                         }
                 }
-                if (cd->cache_show) {
-                        p = create_proc_entry("content", S_IFREG|S_IRUSR|S_IWUSR,
-                                              cd->proc_ent);
+                if (cd->cache_show) {
+                        p = create_proc_entry("content", S_IFREG|S_IRUSR|S_IWUSR,
+                                              cd->proc_ent);
                         cd->content_ent = p;
-                        if (p) {
-                                p->proc_fops = &content_file_operations;
-                                p->owner = cd->owner;
-                                p->data = cd;
-                        }
-                }
+                        if (p) {
+                                p->proc_fops = &content_file_operations;
+                                p->owner = cd->owner;
+                                p->data = cd;
+                        }
+                }
         }
         rwlock_init(&cd->hash_lock);
         INIT_LIST_HEAD(&cd->queue);
@@ -418,15 +418,15 @@ static int cache_clean(void)
                 current_index++;
 
         /* find a cleanable entry in the bucket and clean it, or set to next bucket */
-        
+
         if (current_detail && current_index < current_detail->hash_size) {
                 struct cache_head *ch, **cp;
                 struct cache_detail *d;
-                
+
                 write_lock(&current_detail->hash_lock);
 
                 /* Ok, now to clean this strand */
-                        
+
                 cp = & current_detail->hash_table[current_index];
                 ch = *cp;
                 for (; ch; cp= & ch->next, ch= *cp) {
@@ -478,9 +478,9 @@ static void do_cache_clean(struct work_struct *work)
 }
 
 
-/* 
+/*
  * Clean all caches promptly.  This just calls cache_clean
- * repeatedly until we are sure that every cache has had a chance to 
+ * repeatedly until we are sure that every cache has had a chance to
  * be fully cleaned
  */
 void cache_flush(void)
@@ -509,7 +509,7 @@ void cache_purge(struct cache_detail *detail)
  * All deferred requests are stored in a hash table,
  * indexed by "struct cache_head *".
  * As it may be wasteful to store a whole request
- * structure, we allow the request to provide a 
+ * structure, we allow the request to provide a
  * deferred form, which must contain a
  * 'struct cache_deferred_req'
  * This cache_deferred_req contains a method to allow
@@ -585,7 +585,7 @@ static void cache_revisit_request(struct cache_head *item)
 
         INIT_LIST_HEAD(&pending);
         spin_lock(&cache_defer_lock);
-        
+
         lp = cache_defer_hash[hash].next;
         if (lp) {
                 while (lp != &cache_defer_hash[hash]) {
@@ -615,7 +615,7 @@ void cache_clean_deferred(void *owner)
 
         INIT_LIST_HEAD(&pending);
         spin_lock(&cache_defer_lock);
-        
+
         list_for_each_entry_safe(dreq, tmp, &cache_defer_list, recent) {
                 if (dreq->owner == owner) {
                         list_del(&dreq->hash);
@@ -640,7 +640,7 @@ void cache_clean_deferred(void *owner)
  * On write, an update request is processed
  * Poll works if anything to read, and always allows write
  *
- * Implemented by linked list of requests.  Each open file has 
+ * Implemented by linked list of requests.  Each open file has
  * a ->private that also exists in this list.  New request are added
  * to the end and may wakeup and preceding readers.
  * New readers are added to the head.  If, on read, an item is found with
@@ -888,7 +888,7 @@ cache_release(struct inode *inode, struct file *filp)
 
 
 
-static struct file_operations cache_file_operations = {
+static const struct file_operations cache_file_operations = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .read           = cache_read,
@@ -1060,10 +1060,10 @@ static int cache_make_upcall(struct cache_detail *detail, struct cache_head *h)
  * Messages are, like requests, separated into fields by
  * spaces and dequotes as \xHEXSTRING or embedded \nnn octal
  *
- * Message is 
+ * Message is
  *   reply cachename expiry key ... content....
  *
- * key and content are both parsed by cache 
+ * key and content are both parsed by cache
  */
 
 #define isodigit(c) (isdigit(c) && c <= '7')
@@ -1133,7 +1133,7 @@ static void *c_start(struct seq_file *m, loff_t *pos)
         unsigned hash, entry;
         struct cache_head *ch;
         struct cache_detail *cd = ((struct handle*)m->private)->cd;
-        
+
 
         read_lock(&cd->hash_lock);
         if (!n--)
@@ -1148,7 +1148,7 @@ static void *c_start(struct seq_file *m, loff_t *pos)
         do {
                 hash++;
                 n += 1LL<<32;
-        } while(hash < cd->hash_size && 
+        } while(hash < cd->hash_size &&
                 cd->hash_table[hash]==NULL);
         if (hash >= cd->hash_size)
                 return NULL;
@@ -1246,7 +1246,7 @@ static int content_release(struct inode *inode, struct file *file)
         return seq_release(inode, file);
 }
 
-static struct file_operations content_file_operations = {
+static const struct file_operations content_file_operations = {
         .open           = content_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -1298,7 +1298,7 @@ static ssize_t write_flush(struct file * file, const char __user * buf,
         return count;
 }
 
-static struct file_operations cache_flush_operations = {
+static const struct file_operations cache_flush_operations = {
         .open           = nonseekable_open,
         .read           = read_flush,
         .write          = write_flush,
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index c21aa0a7f77..6d7221fe990 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -416,7 +416,7 @@ struct rpc_clnt *rpc_bind_new_program(struct rpc_clnt *old,
                 rpc_shutdown_client(clnt);
                 clnt = ERR_PTR(err);
         }
-out:    
+out:
         return clnt;
 }
 
@@ -437,7 +437,7 @@ static const struct rpc_call_ops rpc_default_ops = {
  *      sleeps on RPC calls
  */
 #define RPC_INTR_SIGNALS (sigmask(SIGHUP) | sigmask(SIGINT) | sigmask(SIGQUIT) | sigmask(SIGTERM))
- 
+
 static void rpc_save_sigmask(sigset_t *oldset, int intr)
 {
         unsigned long   sigallow = sigmask(SIGKILL);
@@ -480,7 +480,7 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
         int             status;
 
         /* If this client is slain all further I/O fails */
-        if (clnt->cl_dead) 
+        if (clnt->cl_dead)
                 return -EIO;
 
         BUG_ON(flags & RPC_TASK_ASYNC);
@@ -517,7 +517,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
 
         /* If this client is slain all further I/O fails */
         status = -EIO;
-        if (clnt->cl_dead) 
+        if (clnt->cl_dead)
                 goto out_release;
 
         flags |= RPC_TASK_ASYNC;
@@ -528,7 +528,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
                 goto out_release;
 
         /* Mask signals on GSS_AUTH upcalls */
-        rpc_task_sigmask(task, &oldset);                
+        rpc_task_sigmask(task, &oldset);
 
         rpc_call_setup(task, msg, 0);
 
@@ -539,7 +539,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
         else
                 rpc_put_task(task);
 
-        rpc_restore_sigmask(&oldset);           
+        rpc_restore_sigmask(&oldset);
         return status;
 out_release:
         rpc_release_calldata(tk_ops, data);
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c
index 12ab4ec5fc7..d9f76534458 100644
--- a/net/sunrpc/pmap_clnt.c
+++ b/net/sunrpc/pmap_clnt.c
@@ -333,7 +333,7 @@ static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp)
 static struct rpc_procinfo      pmap_procedures[] = {
 [PMAP_SET] = {
           .p_proc               = PMAP_SET,
-          .p_encode             = (kxdrproc_t) xdr_encode_mapping,      
+          .p_encode             = (kxdrproc_t) xdr_encode_mapping,
           .p_decode             = (kxdrproc_t) xdr_decode_bool,
           .p_bufsiz             = 4,
           .p_count              = 1,
@@ -342,7 +342,7 @@ static struct rpc_procinfo	pmap_procedures[] = {
         },
 [PMAP_UNSET] = {
           .p_proc               = PMAP_UNSET,
-          .p_encode             = (kxdrproc_t) xdr_encode_mapping,      
+          .p_encode             = (kxdrproc_t) xdr_encode_mapping,
           .p_decode             = (kxdrproc_t) xdr_decode_bool,
           .p_bufsiz             = 4,
           .p_count              = 1,
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 08128287815..9b9ea504556 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -309,7 +309,7 @@ rpc_pipe_ioctl(struct inode *ino, struct file *filp,
         }
 }
 
-static struct file_operations rpc_pipe_fops = {
+static const struct file_operations rpc_pipe_fops = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
         .read           = rpc_pipe_read,
@@ -366,7 +366,7 @@ rpc_info_release(struct inode *inode, struct file *file)
         return single_release(inode, file);
 }
 
-static struct file_operations rpc_info_operations = {
+static const struct file_operations rpc_info_operations = {
         .owner          = THIS_MODULE,
         .open           = rpc_info_open,
         .read           = seq_read,
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index ca56b8e9b64..6d87320074b 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -4,7 +4,7 @@
  * Scheduling for synchronous and asynchronous RPC requests.
  *
  * Copyright (C) 1996 Olaf Kirch, <okir@monad.swb.de>
- * 
+ *
  * TCP NFS related read + write fixes
  * (C) 1999 Dave Airlie, University of Limerick, Ireland <airlied@linux.ie>
  */
@@ -307,7 +307,7 @@ EXPORT_SYMBOL(__rpc_wait_for_completion_task);
 /*
  * Make an RPC task runnable.
  *
- * Note: If the task is ASYNC, this must be called with 
+ * Note: If the task is ASYNC, this must be called with
  * the spinlock held to protect the wait queue operation.
  */
 static void rpc_make_runnable(struct rpc_task *task)
@@ -648,8 +648,8 @@ static void __rpc_execute(struct rpc_task *task)
                 if (RPC_DO_CALLBACK(task)) {
                         /* Define a callback save pointer */
                         void (*save_callback)(struct rpc_task *);
-        
-                        /* 
+
+                        /*
                          * If a callback exists, save it, reset it,
                          * call it.
                          * The save is needed to stop from resetting
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index d19cd9ec6e9..2878e20ebd0 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -66,7 +66,7 @@ static int rpc_proc_open(struct inode *inode, struct file *file)
         return single_open(file, rpc_proc_show, PDE(inode)->data);
 }
 
-static struct file_operations rpc_proc_fops = {
+static const struct file_operations rpc_proc_fops = {
         .owner = THIS_MODULE,
         .open = rpc_proc_open,
         .read  = seq_read,
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index b0fb6406d54..4ab137403e1 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -386,7 +386,7 @@ svc_destroy(struct svc_serv *serv)
                 svsk = list_entry(serv->sv_tempsocks.next,
                                   struct svc_sock,
                                   sk_list);
-                svc_delete_socket(svsk);
+                svc_close_socket(svsk);
         }
         if (serv->sv_shutdown)
                 serv->sv_shutdown(serv);
@@ -395,9 +395,9 @@ svc_destroy(struct svc_serv *serv)
                 svsk = list_entry(serv->sv_permsocks.next,
                                   struct svc_sock,
                                   sk_list);
-                svc_delete_socket(svsk);
+                svc_close_socket(svsk);
         }
-        
+
         cache_clean_deferred(serv);
 
         /* Unregister service with the portmapper */
@@ -415,7 +415,7 @@ svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
 {
         int pages;
         int arghi;
-        
+
         pages = size / PAGE_SIZE + 1; /* extra page as we hold both request and reply.
                                        * We assume one is at most one page
                                        */
@@ -514,7 +514,7 @@ choose_pool(struct svc_serv *serv, struct svc_pool *pool, unsigned int *state)
         if (pool != NULL)
                 return pool;
 
-        return &serv->sv_pools[(*state)++ % serv->sv_nrpools];
+        return &serv->sv_pools[(*state)++ % serv->sv_nrpools];
 }
 
 /*
@@ -530,13 +530,13 @@ choose_victim(struct svc_serv *serv, struct svc_pool *pool, unsigned int *state)
                 spin_lock_bh(&pool->sp_lock);
         } else {
                 /* choose a pool in round-robin fashion */
-                for (i = 0; i < serv->sv_nrpools; i++) {
-                        pool = &serv->sv_pools[--(*state) % serv->sv_nrpools];
+                for (i = 0; i < serv->sv_nrpools; i++) {
+                        pool = &serv->sv_pools[--(*state) % serv->sv_nrpools];
                         spin_lock_bh(&pool->sp_lock);
-                        if (!list_empty(&pool->sp_all_threads))
-                                goto found_pool;
+                        if (!list_empty(&pool->sp_all_threads))
+                                goto found_pool;
                         spin_unlock_bh(&pool->sp_lock);
-                }
+                }
                 return NULL;
         }
 
@@ -551,7 +551,7 @@ found_pool:
                 rqstp = list_entry(pool->sp_all_threads.next, struct svc_rqst, rq_all);
                 list_del_init(&rqstp->rq_all);
                 task = rqstp->rq_task;
-        }
+        }
         spin_unlock_bh(&pool->sp_lock);
 
         return task;
@@ -636,7 +636,7 @@ svc_exit_thread(struct svc_rqst *rqstp)
 
 /*
  * Register an RPC service with the local portmapper.
- * To unregister a service, call this routine with 
+ * To unregister a service, call this routine with
  * proto and port == 0.
  */
 int
@@ -709,7 +709,7 @@ svc_process(struct svc_rqst *rqstp)
                 goto err_short_len;
 
         /* setup response xdr_buf.
-         * Initially it has just one page 
+         * Initially it has just one page
          */
         rqstp->rq_resused = 1;
         resv->iov_base = page_address(rqstp->rq_respages[0]);
@@ -811,7 +811,7 @@ svc_process(struct svc_rqst *rqstp)
         memset(rqstp->rq_argp, 0, procp->pc_argsize);
         memset(rqstp->rq_resp, 0, procp->pc_ressize);
 
-        /* un-reserve some of the out-queue now that we have a 
+        /* un-reserve some of the out-queue now that we have a
          * better idea of reply size
          */
         if (procp->pc_xdrressize)
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
index c7bb5f7f21a..811a24c8326 100644
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
@@ -2,7 +2,7 @@
  * linux/net/sunrpc/svcauth.c
  *
  * The generic interface for RPC authentication on the server side.
- * 
+ *
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  *
  * CHANGES
@@ -74,7 +74,7 @@ int svc_authorise(struct svc_rqst *rqstp)
         int rv = 0;
 
         rqstp->rq_authop = NULL;
-        
+
         if (aops) {
                 rv = aops->release(rqstp);
                 module_put(aops->owner);
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 0d1e8fb83b9..4b775dbf580 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -151,7 +151,7 @@ static void ip_map_request(struct cache_detail *cd,
         char text_addr[20];
         struct ip_map *im = container_of(h, struct ip_map, h);
         __be32 addr = im->m_addr.s_addr;
-        
+
         snprintf(text_addr, 20, "%u.%u.%u.%u",
                  ntohl(addr) >> 24 & 0xff,
                  ntohl(addr) >> 16 & 0xff,
@@ -198,7 +198,7 @@ static int ip_map_parse(struct cache_detail *cd,
 
         if (sscanf(buf, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) != 4)
                 return -EINVAL;
-        
+
         expiry = get_expiry(&mesg);
         if (expiry ==0)
                 return -EINVAL;
@@ -248,7 +248,7 @@ static int ip_map_show(struct seq_file *m,
         /* class addr domain */
         addr = im->m_addr;
 
-        if (test_bit(CACHE_VALID, &h->flags) && 
+        if (test_bit(CACHE_VALID, &h->flags) &&
             !test_bit(CACHE_NEGATIVE, &h->flags))
                 dom = im->m_client->h.name;
 
@@ -262,7 +262,7 @@ static int ip_map_show(struct seq_file *m,
                    );
         return 0;
 }
-        
+
 
 struct cache_detail ip_map_cache = {
         .owner          = THIS_MODULE,
@@ -343,7 +343,7 @@ int auth_unix_add_addr(struct in_addr addr, struct auth_domain *dom)
 int auth_unix_forget_old(struct auth_domain *dom)
 {
         struct unix_domain *udom;
-        
+
         if (dom->flavour != &svcauth_unix)
                 return -EINVAL;
         udom = container_of(dom, struct unix_domain, h);
@@ -421,6 +421,7 @@ svcauth_unix_info_release(void *info)
 static int
 svcauth_unix_set_client(struct svc_rqst *rqstp)
 {
+        struct sockaddr_in *sin = svc_addr_in(rqstp);
         struct ip_map *ipm;
 
         rqstp->rq_client = NULL;
@@ -430,7 +431,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
         ipm = ip_map_cached_get(rqstp);
         if (ipm == NULL)
                 ipm = ip_map_lookup(rqstp->rq_server->sv_program->pg_class,
-                                    rqstp->rq_addr.sin_addr);
+                                    sin->sin_addr);
 
         if (ipm == NULL)
                 return SVC_DENIED;
@@ -465,7 +466,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
         if (argv->iov_len < 3*4)
                 return SVC_GARBAGE;
 
-        if (svc_getu32(argv) != 0) { 
+        if (svc_getu32(argv) != 0) {
                 dprintk("svc: bad null cred\n");
                 *authp = rpc_autherr_badcred;
                 return SVC_DENIED;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index ff1f8bf680a..63ae94771b8 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -36,11 +36,13 @@
 #include <net/sock.h>
 #include <net/checksum.h>
 #include <net/ip.h>
+#include <net/ipv6.h>
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
 #include <linux/sunrpc/types.h>
+#include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/stats.h>
@@ -58,10 +60,16 @@
  *      providing that certain rules are followed:
  *
  *      SK_CONN, SK_DATA, can be set or cleared at any time.
- *              after a set, svc_sock_enqueue must be called.   
+ *              after a set, svc_sock_enqueue must be called.
  *              after a clear, the socket must be read/accepted
  *               if this succeeds, it must be set again.
  *      SK_CLOSE can set at any time. It is never cleared.
+ *      sk_inuse contains a bias of '1' until SK_DEAD is set.
+ *             so when sk_inuse hits zero, we know the socket is dead
+ *             and no-one is using it.
+ *      SK_DEAD can only be set while SK_BUSY is held which ensures
+ *             no other thread will be using the socket or will try to
+ *             set SK_DEAD.
  *
  */
 
@@ -69,7 +77,8 @@
 
 
 static struct svc_sock *svc_setup_socket(struct svc_serv *, struct socket *,
-                                         int *errp, int pmap_reg);
+                                         int *errp, int flags);
+static void             svc_delete_socket(struct svc_sock *svsk);
 static void             svc_udp_data_ready(struct sock *, int);
 static int              svc_udp_recvfrom(struct svc_rqst *);
 static int              svc_udp_sendto(struct svc_rqst *);
@@ -114,6 +123,41 @@ static inline void svc_reclassify_socket(struct socket *sock)
 }
 #endif
 
+static char *__svc_print_addr(struct sockaddr *addr, char *buf, size_t len)
+{
+        switch (addr->sa_family) {
+        case AF_INET:
+                snprintf(buf, len, "%u.%u.%u.%u, port=%u",
+                        NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),
+                        htons(((struct sockaddr_in *) addr)->sin_port));
+                break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6:
+                snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",
+                        NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),
+                        htons(((struct sockaddr_in6 *) addr)->sin6_port));
+                break;
+#endif
+        default:
+                snprintf(buf, len, "unknown address type: %d", addr->sa_family);
+                break;
+        }
+        return buf;
+}
+
+/**
+ * svc_print_addr - Format rq_addr field for printing
+ * @rqstp: svc_rqst struct containing address to print
+ * @buf: target buffer for formatted address
+ * @len: length of target buffer
+ *
+ */
+char *svc_print_addr(struct svc_rqst *rqstp, char *buf, size_t len)
+{
+        return __svc_print_addr(svc_addr(rqstp), buf, len);
+}
+EXPORT_SYMBOL_GPL(svc_print_addr);
+
 /*
  * Queue up an idle server thread.  Must have pool->sp_lock held.
  * Note: this is really a stack rather than a queue, so that we only
@@ -245,7 +289,7 @@ svc_sock_enqueue(struct svc_sock *svsk)
                         svsk->sk_sk, rqstp);
                 svc_thread_dequeue(pool, rqstp);
                 if (rqstp->rq_sock)
-                        printk(KERN_ERR 
+                        printk(KERN_ERR
                                 "svc_sock_enqueue: server %p, rq_sock=%p!\n",
                                 rqstp, rqstp->rq_sock);
                 rqstp->rq_sock = svsk;
@@ -329,8 +373,9 @@ void svc_reserve(struct svc_rqst *rqstp, int space)
 static inline void
 svc_sock_put(struct svc_sock *svsk)
 {
-        if (atomic_dec_and_test(&svsk->sk_inuse) &&
-                        test_bit(SK_DEAD, &svsk->sk_flags)) {
+        if (atomic_dec_and_test(&svsk->sk_inuse)) {
+                BUG_ON(! test_bit(SK_DEAD, &svsk->sk_flags));
+
                 dprintk("svc: releasing dead socket\n");
                 if (svsk->sk_sock->file)
                         sockfd_put(svsk->sk_sock);
@@ -402,6 +447,43 @@ svc_wake_up(struct svc_serv *serv)
         }
 }
 
+union svc_pktinfo_u {
+        struct in_pktinfo pkti;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        struct in6_pktinfo pkti6;
+#endif
+};
+
+static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)
+{
+        switch (rqstp->rq_sock->sk_sk->sk_family) {
+        case AF_INET: {
+                        struct in_pktinfo *pki = CMSG_DATA(cmh);
+
+                        cmh->cmsg_level = SOL_IP;
+                        cmh->cmsg_type = IP_PKTINFO;
+                        pki->ipi_ifindex = 0;
+                        pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;
+                        cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
+                }
+                break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6: {
+                        struct in6_pktinfo *pki = CMSG_DATA(cmh);
+
+                        cmh->cmsg_level = SOL_IPV6;
+                        cmh->cmsg_type = IPV6_PKTINFO;
+                        pki->ipi6_ifindex = 0;
+                        ipv6_addr_copy(&pki->ipi6_addr,
+                                        &rqstp->rq_daddr.addr6);
+                        cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
+                }
+                break;
+#endif
+        }
+        return;
+}
+
 /*
  * Generic sendto routine
  */
@@ -411,9 +493,8 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
         struct svc_sock *svsk = rqstp->rq_sock;
         struct socket   *sock = svsk->sk_sock;
         int             slen;
-        char            buffer[CMSG_SPACE(sizeof(struct in_pktinfo))];
+        char            buffer[CMSG_SPACE(sizeof(union svc_pktinfo_u))];
         struct cmsghdr *cmh = (struct cmsghdr *)buffer;
-        struct in_pktinfo *pki = (struct in_pktinfo *)CMSG_DATA(cmh);
         int             len = 0;
         int             result;
         int             size;
@@ -421,25 +502,20 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
         size_t          base = xdr->page_base;
         unsigned int    pglen = xdr->page_len;
         unsigned int    flags = MSG_MORE;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
         slen = xdr->len;
 
         if (rqstp->rq_prot == IPPROTO_UDP) {
-                /* set the source and destination */
-                struct msghdr   msg;
-                msg.msg_name    = &rqstp->rq_addr;
-                msg.msg_namelen = sizeof(rqstp->rq_addr);
-                msg.msg_iov     = NULL;
-                msg.msg_iovlen  = 0;
-                msg.msg_flags   = MSG_MORE;
-
-                msg.msg_control = cmh;
-                msg.msg_controllen = sizeof(buffer);
-                cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
-                cmh->cmsg_level = SOL_IP;
-                cmh->cmsg_type = IP_PKTINFO;
-                pki->ipi_ifindex = 0;
-                pki->ipi_spec_dst.s_addr = rqstp->rq_daddr;
+                struct msghdr msg = {
+                        .msg_name       = &rqstp->rq_addr,
+                        .msg_namelen    = rqstp->rq_addrlen,
+                        .msg_control    = cmh,
+                        .msg_controllen = sizeof(buffer),
+                        .msg_flags      = MSG_MORE,
+                };
+
+                svc_set_cmsg_data(rqstp, cmh);
 
                 if (sock_sendmsg(sock, &msg, 0) < 0)
                         goto out;
@@ -476,16 +552,16 @@ svc_sendto(struct svc_rqst *rqstp, struct xdr_buf *xdr)
         if (xdr->tail[0].iov_len) {
                 result = kernel_sendpage(sock, rqstp->rq_respages[0],
                                              ((unsigned long)xdr->tail[0].iov_base)
-                                                & (PAGE_SIZE-1),
+                                                & (PAGE_SIZE-1),
                                              xdr->tail[0].iov_len, 0);
 
                 if (result > 0)
                         len += result;
         }
 out:
-        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %x)\n",
-                        rqstp->rq_sock, xdr->head[0].iov_base, xdr->head[0].iov_len, xdr->len, len,
-                rqstp->rq_addr.sin_addr.s_addr);
+        dprintk("svc: socket %p sendto([%p %Zu... ], %d) = %d (addr %s)\n",
+                rqstp->rq_sock, xdr->head[0].iov_base, xdr->head[0].iov_len,
+                xdr->len, len, svc_print_addr(rqstp, buf, sizeof(buf)));
 
         return len;
 }
@@ -520,7 +596,7 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
 
         if (!serv)
                 return 0;
-        spin_lock(&serv->sv_lock);
+        spin_lock_bh(&serv->sv_lock);
         list_for_each_entry(svsk, &serv->sv_permsocks, sk_list) {
                 int onelen = one_sock_name(buf+len, svsk);
                 if (toclose && strcmp(toclose, buf+len) == 0)
@@ -528,12 +604,12 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
                 else
                         len += onelen;
         }
-        spin_unlock(&serv->sv_lock);
+        spin_unlock_bh(&serv->sv_lock);
         if (closesk)
                 /* Should unregister with portmap, but you cannot
                  * unregister just one protocol...
                  */
-                svc_delete_socket(closesk);
+                svc_close_socket(closesk);
         else if (toclose)
                 return -ENOENT;
         return len;
@@ -560,31 +636,22 @@ svc_recv_available(struct svc_sock *svsk)
 static int
 svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen)
 {
-        struct msghdr   msg;
-        struct socket   *sock;
-        int             len, alen;
-
-        rqstp->rq_addrlen = sizeof(rqstp->rq_addr);
-        sock = rqstp->rq_sock->sk_sock;
-
-        msg.msg_name    = &rqstp->rq_addr;
-        msg.msg_namelen = sizeof(rqstp->rq_addr);
-        msg.msg_control = NULL;
-        msg.msg_controllen = 0;
-
-        msg.msg_flags   = MSG_DONTWAIT;
+        struct svc_sock *svsk = rqstp->rq_sock;
+        struct msghdr msg = {
+                .msg_flags      = MSG_DONTWAIT,
+        };
+        int len;
 
-        len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT);
+        len = kernel_recvmsg(svsk->sk_sock, &msg, iov, nr, buflen,
+                                msg.msg_flags);
 
         /* sock_recvmsg doesn't fill in the name/namelen, so we must..
-         * possibly we should cache this in the svc_sock structure
-         * at accept time. FIXME
          */
-        alen = sizeof(rqstp->rq_addr);
-        kernel_getpeername(sock, (struct sockaddr *)&rqstp->rq_addr, &alen);
+        memcpy(&rqstp->rq_addr, &svsk->sk_remote, svsk->sk_remotelen);
+        rqstp->rq_addrlen = svsk->sk_remotelen;
 
         dprintk("svc: socket %p recvfrom(%p, %Zu) = %d\n",
-                rqstp->rq_sock, iov[0].iov_base, iov[0].iov_len, len);
+                svsk, iov[0].iov_base, iov[0].iov_len, len);
 
         return len;
 }
@@ -654,6 +721,47 @@ svc_write_space(struct sock *sk)
         }
 }
 
+static void svc_udp_get_sender_address(struct svc_rqst *rqstp,
+                                        struct sk_buff *skb)
+{
+        switch (rqstp->rq_sock->sk_sk->sk_family) {
+        case AF_INET: {
+                /* this seems to come from net/ipv4/udp.c:udp_recvmsg */
+                        struct sockaddr_in *sin = svc_addr_in(rqstp);
+
+                        sin->sin_family = AF_INET;
+                        sin->sin_port = skb->h.uh->source;
+                        sin->sin_addr.s_addr = skb->nh.iph->saddr;
+                        rqstp->rq_addrlen = sizeof(struct sockaddr_in);
+                        /* Remember which interface received this request */
+                        rqstp->rq_daddr.addr.s_addr = skb->nh.iph->daddr;
+                }
+                break;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6: {
+                /* this is derived from net/ipv6/udp.c:udpv6_recvmesg */
+                        struct sockaddr_in6 *sin6 = svc_addr_in6(rqstp);
+
+                        sin6->sin6_family = AF_INET6;
+                        sin6->sin6_port = skb->h.uh->source;
+                        sin6->sin6_flowinfo = 0;
+                        sin6->sin6_scope_id = 0;
+                        if (ipv6_addr_type(&sin6->sin6_addr) &
+                                                        IPV6_ADDR_LINKLOCAL)
+                                sin6->sin6_scope_id = IP6CB(skb)->iif;
+                        ipv6_addr_copy(&sin6->sin6_addr,
+                                                        &skb->nh.ipv6h->saddr);
+                        rqstp->rq_addrlen = sizeof(struct sockaddr_in);
+                        /* Remember which interface received this request */
+                        ipv6_addr_copy(&rqstp->rq_daddr.addr6,
+                                                        &skb->nh.ipv6h->saddr);
+                }
+                break;
+#endif
+        }
+        return;
+}
+
 /*
  * Receive a datagram from a UDP socket.
  */
@@ -683,6 +791,11 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 return svc_deferred_recv(rqstp);
         }
 
+        if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
+                svc_delete_socket(svsk);
+                return 0;
+        }
+
         clear_bit(SK_DATA, &svsk->sk_flags);
         while ((skb = skb_recv_datagram(svsk->sk_sk, 0, 1, &err)) == NULL) {
                 if (err == -EAGAIN) {
@@ -698,7 +811,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 tv.tv_sec = xtime.tv_sec;
                 tv.tv_usec = xtime.tv_nsec / NSEC_PER_USEC;
                 skb_set_timestamp(skb, &tv);
-                /* Don't enable netstamp, sunrpc doesn't 
+                /* Don't enable netstamp, sunrpc doesn't
                    need that much accuracy */
         }
         skb_get_timestamp(skb, &svsk->sk_sk->sk_stamp);
@@ -712,13 +825,9 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
         len  = skb->len - sizeof(struct udphdr);
         rqstp->rq_arg.len = len;
 
-        rqstp->rq_prot        = IPPROTO_UDP;
+        rqstp->rq_prot = IPPROTO_UDP;
 
-        /* Get sender address */
-        rqstp->rq_addr.sin_family = AF_INET;
-        rqstp->rq_addr.sin_port = skb->h.uh->source;
-        rqstp->rq_addr.sin_addr.s_addr = skb->nh.iph->saddr;
-        rqstp->rq_daddr = skb->nh.iph->daddr;
+        svc_udp_get_sender_address(rqstp, skb);
 
         if (skb_is_nonlinear(skb)) {
                 /* we have to copy */
@@ -730,7 +839,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                         return 0;
                 }
                 local_bh_enable();
-                skb_free_datagram(svsk->sk_sk, skb); 
+                skb_free_datagram(svsk->sk_sk, skb);
         } else {
                 /* we can use it in-place */
                 rqstp->rq_arg.head[0].iov_base = skb->data + sizeof(struct udphdr);
@@ -781,7 +890,7 @@ svc_udp_init(struct svc_sock *svsk)
         svsk->sk_sendto = svc_udp_sendto;
 
         /* initialise setting must have enough space to
-         * receive and respond to one request.  
+         * receive and respond to one request.
          * svc_udp_recvfrom will re-adjust if necessary
          */
         svc_sock_setbufsize(svsk->sk_sock,
@@ -862,18 +971,36 @@ svc_tcp_data_ready(struct sock *sk, int count)
                 wake_up_interruptible(sk->sk_sleep);
 }
 
+static inline int svc_port_is_privileged(struct sockaddr *sin)
+{
+        switch (sin->sa_family) {
+        case AF_INET:
+                return ntohs(((struct sockaddr_in *)sin)->sin_port)
+                        < PROT_SOCK;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        case AF_INET6:
+                return ntohs(((struct sockaddr_in6 *)sin)->sin6_port)
+                        < PROT_SOCK;
+#endif
+        default:
+                return 0;
+        }
+}
+
 /*
  * Accept a TCP connection
  */
 static void
 svc_tcp_accept(struct svc_sock *svsk)
 {
-        struct sockaddr_in sin;
+        struct sockaddr_storage addr;
+        struct sockaddr *sin = (struct sockaddr *) &addr;
         struct svc_serv *serv = svsk->sk_server;
         struct socket   *sock = svsk->sk_sock;
         struct socket   *newsock;
         struct svc_sock *newsvsk;
         int             err, slen;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
         dprintk("svc: tcp_accept %p sock %p\n", svsk, sock);
         if (!sock)
@@ -894,8 +1021,7 @@ svc_tcp_accept(struct svc_sock *svsk)
         set_bit(SK_CONN, &svsk->sk_flags);
         svc_sock_enqueue(svsk);
 
-        slen = sizeof(sin);
-        err = kernel_getpeername(newsock, (struct sockaddr *) &sin, &slen);
+        err = kernel_getpeername(newsock, sin, &slen);
         if (err < 0) {
                 if (net_ratelimit())
                         printk(KERN_WARNING "%s: peername failed (err %d)!\n",
@@ -904,27 +1030,30 @@ svc_tcp_accept(struct svc_sock *svsk)
         }
 
         /* Ideally, we would want to reject connections from unauthorized
-         * hosts here, but when we get encription, the IP of the host won't
-         * tell us anything. For now just warn about unpriv connections.
+         * hosts here, but when we get encryption, the IP of the host won't
+         * tell us anything.  For now just warn about unpriv connections.
          */
-        if (ntohs(sin.sin_port) >= 1024) {
+        if (!svc_port_is_privileged(sin)) {
                 dprintk(KERN_WARNING
-                        "%s: connect from unprivileged port: %u.%u.%u.%u:%d\n",
-                        serv->sv_name, 
-                        NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
+                        "%s: connect from unprivileged port: %s\n",
+                        serv->sv_name,
+                        __svc_print_addr(sin, buf, sizeof(buf)));
         }
-
-        dprintk("%s: connect from %u.%u.%u.%u:%04x\n", serv->sv_name,
-                        NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
+        dprintk("%s: connect from %s\n", serv->sv_name,
+                __svc_print_addr(sin, buf, sizeof(buf)));
 
         /* make sure that a write doesn't block forever when
          * low on memory
          */
         newsock->sk->sk_sndtimeo = HZ*30;
 
-        if (!(newsvsk = svc_setup_socket(serv, newsock, &err, 0)))
+        if (!(newsvsk = svc_setup_socket(serv, newsock, &err,
+                                 (SVC_SOCK_ANONYMOUS | SVC_SOCK_TEMPORARY))))
                 goto failed;
+        memcpy(&newsvsk->sk_remote, sin, slen);
+        newsvsk->sk_remotelen = slen;
 
+        svc_sock_received(newsvsk);
 
         /* make sure that we don't have too many active connections.
          * If we have, something must be dropped.
@@ -947,11 +1076,9 @@ svc_tcp_accept(struct svc_sock *svsk)
                                         "sockets, consider increasing the "
                                         "number of nfsd threads\n",
                                                    serv->sv_name);
-                                printk(KERN_NOTICE "%s: last TCP connect from "
-                                        "%u.%u.%u.%u:%d\n",
-                                        serv->sv_name,
-                                        NIPQUAD(sin.sin_addr.s_addr),
-                                        ntohs(sin.sin_port));
+                                printk(KERN_NOTICE
+                                       "%s: last TCP connect from %s\n",
+                                       serv->sv_name, buf);
                         }
                         /*
                          * Always select the oldest socket. It's not fair,
@@ -1025,7 +1152,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
                  * on the number of threads which will access the socket.
                  *
                  * rcvbuf just needs to be able to hold a few requests.
-                 * Normally they will be removed from the queue 
+                 * Normally they will be removed from the queue
                  * as soon a a complete request arrives.
                  */
                 svc_sock_setbufsize(svsk->sk_sock,
@@ -1050,7 +1177,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
 
                 if (len < want) {
                         dprintk("svc: short recvfrom while reading record length (%d of %lu)\n",
-                                len, want);
+                                len, want);
                         svc_sock_received(svsk);
                         return -EAGAIN; /* record header not complete */
                 }
@@ -1176,7 +1303,8 @@ svc_tcp_sendto(struct svc_rqst *rqstp)
                        rqstp->rq_sock->sk_server->sv_name,
                        (sent<0)?"got error":"sent only",
                        sent, xbufp->len);
-                svc_delete_socket(rqstp->rq_sock);
+                set_bit(SK_CLOSE, &rqstp->rq_sock->sk_flags);
+                svc_sock_enqueue(rqstp->rq_sock);
                 sent = -EAGAIN;
         }
         return sent;
@@ -1207,7 +1335,7 @@ svc_tcp_init(struct svc_sock *svsk)
                 tp->nonagle = 1;        /* disable Nagle's algorithm */
 
                 /* initialise setting must have enough space to
-                 * receive and respond to one request.  
+                 * receive and respond to one request.
                  * svc_tcp_recvfrom will re-adjust if necessary
                  */
                 svc_sock_setbufsize(svsk->sk_sock,
@@ -1216,7 +1344,7 @@ svc_tcp_init(struct svc_sock *svsk)
 
                 set_bit(SK_CHNGBUF, &svsk->sk_flags);
                 set_bit(SK_DATA, &svsk->sk_flags);
-                if (sk->sk_state != TCP_ESTABLISHED) 
+                if (sk->sk_state != TCP_ESTABLISHED)
                         set_bit(SK_CLOSE, &svsk->sk_flags);
         }
 }
@@ -1232,7 +1360,7 @@ svc_sock_update_bufs(struct svc_serv *serv)
 
         spin_lock_bh(&serv->sv_lock);
         list_for_each(le, &serv->sv_permsocks) {
-                struct svc_sock *svsk = 
+                struct svc_sock *svsk =
                         list_entry(le, struct svc_sock, sk_list);
                 set_bit(SK_CHNGBUF, &svsk->sk_flags);
         }
@@ -1252,7 +1380,7 @@ svc_sock_update_bufs(struct svc_serv *serv)
 int
 svc_recv(struct svc_rqst *rqstp, long timeout)
 {
-        struct svc_sock         *svsk =NULL;
+        struct svc_sock         *svsk = NULL;
         struct svc_serv         *serv = rqstp->rq_server;
         struct svc_pool         *pool = rqstp->rq_pool;
         int                     len, i;
@@ -1264,11 +1392,11 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
                 rqstp, timeout);
 
         if (rqstp->rq_sock)
-                printk(KERN_ERR 
+                printk(KERN_ERR
                         "svc_recv: service %p, socket not NULL!\n",
                          rqstp);
         if (waitqueue_active(&rqstp->rq_wait))
-                printk(KERN_ERR 
+                printk(KERN_ERR
                         "svc_recv: service %p, wait queue active!\n",
                          rqstp);
 
@@ -1349,7 +1477,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
         svsk->sk_lastrecv = get_seconds();
         clear_bit(SK_OLD, &svsk->sk_flags);
 
-        rqstp->rq_secure  = ntohs(rqstp->rq_addr.sin_port) < 1024;
+        rqstp->rq_secure = svc_port_is_privileged(svc_addr(rqstp));
         rqstp->rq_chandle.defer = svc_defer;
 
         if (serv->sv_stats)
@@ -1357,7 +1485,7 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
         return len;
 }
 
-/* 
+/*
  * Drop request
  */
 void
@@ -1462,12 +1590,14 @@ svc_age_temp_sockets(unsigned long closure)
  * Initialize socket for RPC use and create svc_sock struct
  * XXX: May want to setsockopt SO_SNDBUF and SO_RCVBUF.
  */
-static struct svc_sock *
-svc_setup_socket(struct svc_serv *serv, struct socket *sock,
-                                        int *errp, int pmap_register)
+static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
+                                                struct socket *sock,
+                                                int *errp, int flags)
 {
         struct svc_sock *svsk;
         struct sock     *inet;
+        int             pmap_register = !(flags & SVC_SOCK_ANONYMOUS);
+        int             is_temporary = flags & SVC_SOCK_TEMPORARY;
 
         dprintk("svc: svc_setup_socket %p\n", sock);
         if (!(svsk = kzalloc(sizeof(*svsk), GFP_KERNEL))) {
@@ -1495,7 +1625,7 @@ svc_setup_socket(struct svc_serv *serv, struct socket *sock,
         svsk->sk_odata = inet->sk_data_ready;
         svsk->sk_owspace = inet->sk_write_space;
         svsk->sk_server = serv;
-        atomic_set(&svsk->sk_inuse, 0);
+        atomic_set(&svsk->sk_inuse, 1);
         svsk->sk_lastrecv = get_seconds();
         spin_lock_init(&svsk->sk_defer_lock);
         INIT_LIST_HEAD(&svsk->sk_deferred);
@@ -1509,7 +1639,7 @@ svc_setup_socket(struct svc_serv *serv, struct socket *sock,
                 svc_tcp_init(svsk);
 
         spin_lock_bh(&serv->sv_lock);
-        if (!pmap_register) {
+        if (is_temporary) {
                 set_bit(SK_TEMP, &svsk->sk_flags);
                 list_add(&svsk->sk_list, &serv->sv_tempsocks);
                 serv->sv_tmpcnt++;
@@ -1529,8 +1659,6 @@ svc_setup_socket(struct svc_serv *serv, struct socket *sock,
         dprintk("svc: svc_setup_socket created %p (inet %p)\n",
                                 svsk, svsk->sk_sk);
 
-        clear_bit(SK_BUSY, &svsk->sk_flags);
-        svc_sock_enqueue(svsk);
         return svsk;
 }
 
@@ -1553,9 +1681,11 @@ int svc_addsock(struct svc_serv *serv,
         else if (so->state > SS_UNCONNECTED)
                 err = -EISCONN;
         else {
-                svsk = svc_setup_socket(serv, so, &err, 1);
-                if (svsk)
+                svsk = svc_setup_socket(serv, so, &err, SVC_SOCK_DEFAULTS);
+                if (svsk) {
+                        svc_sock_received(svsk);
                         err = 0;
+                }
         }
         if (err) {
                 sockfd_put(so);
@@ -1569,18 +1699,18 @@ EXPORT_SYMBOL_GPL(svc_addsock);
 /*
  * Create socket for RPC service.
  */
-static int
-svc_create_socket(struct svc_serv *serv, int protocol, struct sockaddr_in *sin)
+static int svc_create_socket(struct svc_serv *serv, int protocol,
+                                struct sockaddr *sin, int len, int flags)
 {
         struct svc_sock *svsk;
         struct socket   *sock;
         int             error;
         int             type;
+        char            buf[RPC_MAX_ADDRBUFLEN];
 
-        dprintk("svc: svc_create_socket(%s, %d, %u.%u.%u.%u:%d)\n",
-                                serv->sv_program->pg_name, protocol,
-                                NIPQUAD(sin->sin_addr.s_addr),
-                                ntohs(sin->sin_port));
+        dprintk("svc: svc_create_socket(%s, %d, %s)\n",
+                        serv->sv_program->pg_name, protocol,
+                        __svc_print_addr(sin, buf, sizeof(buf)));
 
         if (protocol != IPPROTO_UDP && protocol != IPPROTO_TCP) {
                 printk(KERN_WARNING "svc: only UDP and TCP "
@@ -1589,15 +1719,15 @@ svc_create_socket(struct svc_serv *serv, int protocol, struct sockaddr_in *sin)
         }
         type = (protocol == IPPROTO_UDP)? SOCK_DGRAM : SOCK_STREAM;
 
-        if ((error = sock_create_kern(PF_INET, type, protocol, &sock)) < 0)
+        error = sock_create_kern(sin->sa_family, type, protocol, &sock);
+        if (error < 0)
                 return error;
 
         svc_reclassify_socket(sock);
 
         if (type == SOCK_STREAM)
-                sock->sk->sk_reuse = 1; /* allow address reuse */
-        error = kernel_bind(sock, (struct sockaddr *) sin,
-                                        sizeof(*sin));
+                sock->sk->sk_reuse = 1;         /* allow address reuse */
+        error = kernel_bind(sock, sin, len);
         if (error < 0)
                 goto bummer;
 
@@ -1606,8 +1736,10 @@ svc_create_socket(struct svc_serv *serv, int protocol, struct sockaddr_in *sin)
                         goto bummer;
         }
 
-        if ((svsk = svc_setup_socket(serv, sock, &error, 1)) != NULL)
-                return 0;
+        if ((svsk = svc_setup_socket(serv, sock, &error, flags)) != NULL) {
+                svc_sock_received(svsk);
+                return ntohs(inet_sk(svsk->sk_sk)->sport);
+        }
 
 bummer:
         dprintk("svc: svc_create_socket error = %d\n", -error);
@@ -1618,7 +1750,7 @@ bummer:
 /*
  * Remove a dead socket
  */
-void
+static void
 svc_delete_socket(struct svc_sock *svsk)
 {
         struct svc_serv *serv;
@@ -1637,43 +1769,60 @@ svc_delete_socket(struct svc_sock *svsk)
 
         if (!test_and_set_bit(SK_DETACHED, &svsk->sk_flags))
                 list_del_init(&svsk->sk_list);
-        /*
+        /*
          * We used to delete the svc_sock from whichever list
          * it's sk_ready node was on, but we don't actually
          * need to.  This is because the only time we're called
          * while still attached to a queue, the queue itself
          * is about to be destroyed (in svc_destroy).
          */
-        if (!test_and_set_bit(SK_DEAD, &svsk->sk_flags))
+        if (!test_and_set_bit(SK_DEAD, &svsk->sk_flags)) {
+                BUG_ON(atomic_read(&svsk->sk_inuse)<2);
+                atomic_dec(&svsk->sk_inuse);
                 if (test_bit(SK_TEMP, &svsk->sk_flags))
                         serv->sv_tmpcnt--;
+        }
 
-        /* This atomic_inc should be needed - svc_delete_socket
-         * should have the semantic of dropping a reference.
-         * But it doesn't yet....
-         */
-        atomic_inc(&svsk->sk_inuse);
         spin_unlock_bh(&serv->sv_lock);
+}
+
+void svc_close_socket(struct svc_sock *svsk)
+{
+        set_bit(SK_CLOSE, &svsk->sk_flags);
+        if (test_and_set_bit(SK_BUSY, &svsk->sk_flags))
+                /* someone else will have to effect the close */
+                return;
+
+        atomic_inc(&svsk->sk_inuse);
+        svc_delete_socket(svsk);
+        clear_bit(SK_BUSY, &svsk->sk_flags);
         svc_sock_put(svsk);
 }
 
-/*
- * Make a socket for nfsd and lockd
+/**
+ * svc_makesock - Make a socket for nfsd and lockd
+ * @serv: RPC server structure
+ * @protocol: transport protocol to use
+ * @port: port to use
+ * @flags: requested socket characteristics
+ *
  */
-int
-svc_makesock(struct svc_serv *serv, int protocol, unsigned short port)
+int svc_makesock(struct svc_serv *serv, int protocol, unsigned short port,
+                        int flags)
 {
-        struct sockaddr_in      sin;
+        struct sockaddr_in sin = {
+                .sin_family             = AF_INET,
+                .sin_addr.s_addr        = INADDR_ANY,
+                .sin_port               = htons(port),
+        };
 
         dprintk("svc: creating socket proto = %d\n", protocol);
-        sin.sin_family      = AF_INET;
-        sin.sin_addr.s_addr = INADDR_ANY;
-        sin.sin_port        = htons(port);
-        return svc_create_socket(serv, protocol, &sin);
+        return svc_create_socket(serv, protocol, (struct sockaddr *) &sin,
+                                                        sizeof(sin), flags);
 }
 
 /*
- * Handle defer and revisit of requests 
+ * Handle defer and revisit of requests
  */
 
 static void svc_revisit(struct cache_deferred_req *dreq, int too_many)
@@ -1718,7 +1867,8 @@ svc_defer(struct cache_req *req)
 
                 dr->handle.owner = rqstp->rq_server;
                 dr->prot = rqstp->rq_prot;
-                dr->addr = rqstp->rq_addr;
+                memcpy(&dr->addr, &rqstp->rq_addr, rqstp->rq_addrlen);
+                dr->addrlen = rqstp->rq_addrlen;
                 dr->daddr = rqstp->rq_daddr;
                 dr->argslen = rqstp->rq_arg.len >> 2;
                 memcpy(dr->args, rqstp->rq_arg.head[0].iov_base-skip, dr->argslen<<2);
@@ -1742,7 +1892,8 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
         rqstp->rq_arg.page_len = 0;
         rqstp->rq_arg.len = dr->argslen<<2;
         rqstp->rq_prot        = dr->prot;
-        rqstp->rq_addr        = dr->addr;
+        memcpy(&rqstp->rq_addr, &dr->addr, dr->addrlen);
+        rqstp->rq_addrlen     = dr->addrlen;
         rqstp->rq_daddr       = dr->daddr;
         rqstp->rq_respages    = rqstp->rq_pages;
         return dr->argslen<<2;
@@ -1752,7 +1903,7 @@ static int svc_deferred_recv(struct svc_rqst *rqstp)
 static struct svc_deferred_req *svc_deferred_dequeue(struct svc_sock *svsk)
 {
         struct svc_deferred_req *dr = NULL;
-        
+
         if (!test_bit(SK_DEFERRED, &svsk->sk_flags))
                 return NULL;
         spin_lock_bh(&svsk->sk_defer_lock);
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c
index 82b27528d0c..47d8df2b5eb 100644
--- a/net/sunrpc/sysctl.c
+++ b/net/sunrpc/sysctl.c
@@ -42,7 +42,7 @@ rpc_register_sysctl(void)
                         sunrpc_table[0].de->owner = THIS_MODULE;
 #endif
         }
-                        
+
 }
 
 void
@@ -126,7 +126,7 @@ static ctl_table debug_table[] = {
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dodebug
-        }, 
+        },
         {
                 .ctl_name       = CTL_NFSDEBUG,
                 .procname       = "nfs_debug",
@@ -134,7 +134,7 @@ static ctl_table debug_table[] = {
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dodebug
-        }, 
+        },
         {
                 .ctl_name       = CTL_NFSDDEBUG,
                 .procname       = "nfsd_debug",
@@ -142,7 +142,7 @@ static ctl_table debug_table[] = {
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dodebug
-        }, 
+        },
         {
                 .ctl_name       = CTL_NLMDEBUG,
                 .procname       = "nlm_debug",
@@ -150,7 +150,7 @@ static ctl_table debug_table[] = {
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = &proc_dodebug
-        }, 
+        },
         { .ctl_name = 0 }
 };
 
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index a0af250ca31..6a59180e166 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -302,7 +302,7 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len)
  * @buf: xdr_buf
  * @len: bytes to remove from buf->head[0]
  *
- * Shrinks XDR buffer's header kvec buf->head[0] by 
+ * Shrinks XDR buffer's header kvec buf->head[0] by
  * 'len' bytes. The extra data is not lost, but is instead
  * moved into the inlined pages and/or the tail.
  */
@@ -375,7 +375,7 @@ xdr_shrink_bufhead(struct xdr_buf *buf, size_t len)
  * @buf: xdr_buf
  * @len: bytes to remove from buf->pages
  *
- * Shrinks XDR buffer's page array buf->pages by 
+ * Shrinks XDR buffer's page array buf->pages by
  * 'len' bytes. The extra data is not lost, but is instead
  * moved into the tail.
  */
@@ -1024,7 +1024,7 @@ xdr_encode_array2(struct xdr_buf *buf, unsigned int base,
 
 int
 xdr_process_buf(struct xdr_buf *buf, unsigned int offset, unsigned int len,
-                int (*actor)(struct scatterlist *, void *), void *data)
+                int (*actor)(struct scatterlist *, void *), void *data)
 {
         int i, ret = 0;
         unsigned page_len, thislen, page_offset;
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 1975139b26e..ee6ffa01dfb 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -410,7 +410,7 @@ void xprt_set_retrans_timeout_def(struct rpc_task *task)
 /*
  * xprt_set_retrans_timeout_rtt - set a request's retransmit timeout
  * @task: task whose timeout is to be set
- * 
+ *
  * Set a request's retransmit timeout using the RTT estimator.
  */
 void xprt_set_retrans_timeout_rtt(struct rpc_task *task)
@@ -888,7 +888,7 @@ void xprt_release(struct rpc_task *task)
  */
 void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long incr)
 {
-        to->to_initval   = 
+        to->to_initval   =
         to->to_increment = incr;
         to->to_maxval    = to->to_initval + (incr * retr);
         to->to_retries   = retr;