Merge /spare/repo/linux-2.6/

12 files changed, 48 insertions, 45 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 5a7265aeaf83..ee6ae74cd1b2 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -160,7 +160,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
                                 " unsupported checksum %d", cksumtype);
                         goto out;
         }
-        if (!(tfm = crypto_alloc_tfm(cksumname, 0)))
+        if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP)))
                 goto out;
         cksum->len = crypto_tfm_alg_digestsize(tfm);
         if ((cksum->data = kmalloc(cksum->len, GFP_KERNEL)) == NULL)
@@ -199,8 +199,7 @@ make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
         crypto_digest_final(tfm, cksum->data);
         code = 0;
 out:
-        if (tfm)
-                crypto_free_tfm(tfm);
+        crypto_free_tfm(tfm);
         return code;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_krb5_mech.c b/net/sunrpc/auth_gss/gss_krb5_mech.c
index cf726510df8e..606a8a82cafb 100644
--- a/net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/net/sunrpc/auth_gss/gss_krb5_mech.c
@@ -185,12 +185,9 @@ static void
 gss_delete_sec_context_kerberos(void *internal_ctx) {
         struct krb5_ctx *kctx = internal_ctx;
 
-        if (kctx->seq)
-                crypto_free_tfm(kctx->seq);
-        if (kctx->enc)
-                crypto_free_tfm(kctx->enc);
-        if (kctx->mech_used.data)
-                kfree(kctx->mech_used.data);
+        crypto_free_tfm(kctx->seq);
+        crypto_free_tfm(kctx->enc);
+        kfree(kctx->mech_used.data);
         kfree(kctx);
 }
 
diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index dad05994c3eb..6c97d61baa9b 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c
@@ -214,14 +214,10 @@ static void
 gss_delete_sec_context_spkm3(void *internal_ctx) {
         struct spkm3_ctx *sctx = internal_ctx;
 
-        if(sctx->derived_integ_key)
-                crypto_free_tfm(sctx->derived_integ_key);
-        if(sctx->derived_conf_key)
-                crypto_free_tfm(sctx->derived_conf_key);
-        if(sctx->share_key.data)
-                kfree(sctx->share_key.data);
-        if(sctx->mech_used.data)
-                kfree(sctx->mech_used.data);
+        crypto_free_tfm(sctx->derived_integ_key);
+        crypto_free_tfm(sctx->derived_conf_key);
+        kfree(sctx->share_key.data);
+        kfree(sctx->mech_used.data);
         kfree(sctx);
 }
 
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 5c8fe3bfc494..e3308195374e 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -250,6 +250,7 @@ out:
 }
 
 static struct cache_detail rsi_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = RSI_HASHMAX,
         .hash_table     = rsi_table,
         .name           = "auth.rpcsec.init",
@@ -436,6 +437,7 @@ out:
 }
 
 static struct cache_detail rsc_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = RSC_HASHMAX,
         .hash_table     = rsc_table,
         .name           = "auth.rpcsec.context",
@@ -1074,7 +1076,9 @@ gss_svc_init(void)
 void
 gss_svc_shutdown(void)
 {
-        cache_unregister(&rsc_cache);
-        cache_unregister(&rsi_cache);
+        if (cache_unregister(&rsc_cache))
+                printk(KERN_ERR "auth_rpcgss: failed to unregister rsc cache\n");
+        if (cache_unregister(&rsi_cache))
+                printk(KERN_ERR "auth_rpcgss: failed to unregister rsi cache\n");
         svc_auth_unregister(RPC_AUTH_GSS);
 }
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 900f5bc7e336..f509e9992767 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -177,7 +177,7 @@ void cache_register(struct cache_detail *cd)
         cd->proc_ent = proc_mkdir(cd->name, proc_net_rpc);
         if (cd->proc_ent) {
                 struct proc_dir_entry *p;
-                cd->proc_ent->owner = THIS_MODULE;
+                cd->proc_ent->owner = cd->owner;
                 cd->channel_ent = cd->content_ent = NULL;
                 
                 p = create_proc_entry("flush", S_IFREG|S_IRUSR|S_IWUSR,
@@ -185,7 +185,7 @@ void cache_register(struct cache_detail *cd)
                 cd->flush_ent =  p;
                 if (p) {
                         p->proc_fops = &cache_flush_operations;
-                        p->owner = THIS_MODULE;
+                        p->owner = cd->owner;
                         p->data = cd;
                 }
  
@@ -195,7 +195,7 @@ void cache_register(struct cache_detail *cd)
                         cd->channel_ent = p;
                         if (p) {
                                 p->proc_fops = &cache_file_operations;
-                                p->owner = THIS_MODULE;
+                                p->owner = cd->owner;
                                 p->data = cd;
                         }
                 }
@@ -205,7 +205,7 @@ void cache_register(struct cache_detail *cd)
                         cd->content_ent = p;
                         if (p) {
                                 p->proc_fops = &content_file_operations;
-                                p->owner = THIS_MODULE;
+                                p->owner = cd->owner;
                                 p->data = cd;
                         }
                 }
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 554f224c0445..ded6c63f11ec 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -3,7 +3,7 @@
  *
  * Userland/kernel interface for rpcauth_gss.
  * Code shamelessly plagiarized from fs/nfsd/nfsctl.c
- * and fs/driverfs/inode.c
+ * and fs/sysfs/inode.c
  *
  * Copyright (c) 2002, Trond Myklebust <trond.myklebust@fys.uio.no>
  *
@@ -28,13 +28,13 @@
 #include <linux/workqueue.h>
 #include <linux/sunrpc/rpc_pipe_fs.h>
 
-static struct vfsmount *rpc_mount;
+static struct vfsmount *rpc_mount __read_mostly;
 static int rpc_mount_count;
 
 static struct file_system_type rpc_pipe_fs_type;
 
 
-static kmem_cache_t *rpc_inode_cachep;
+static kmem_cache_t *rpc_inode_cachep __read_mostly;
 
 #define RPC_UPCALL_TIMEOUT (30*HZ)
 
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 2d9eb7fbd521..f3104035e35d 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -34,10 +34,10 @@ static int			rpc_task_id;
 #define RPC_BUFFER_MAXSIZE      (2048)
 #define RPC_BUFFER_POOLSIZE     (8)
 #define RPC_TASK_POOLSIZE       (8)
-static kmem_cache_t     *rpc_task_slabp;
-static kmem_cache_t     *rpc_buffer_slabp;
-static mempool_t        *rpc_task_mempool;
-static mempool_t        *rpc_buffer_mempool;
+static kmem_cache_t     *rpc_task_slabp __read_mostly;
+static kmem_cache_t     *rpc_buffer_slabp __read_mostly;
+static mempool_t        *rpc_task_mempool __read_mostly;
+static mempool_t        *rpc_buffer_mempool __read_mostly;
 
 static void                     __rpc_default_timer(struct rpc_task *task);
 static void                     rpciod_killall(void);
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index 9b67dc19944c..4979f226e285 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -35,13 +35,13 @@ static int rpc_proc_show(struct seq_file *seq, void *v) {
         int             i, j;
 
         seq_printf(seq,
-                "net %d %d %d %d\n",
+                "net %u %u %u %u\n",
                         statp->netcnt,
                         statp->netudpcnt,
                         statp->nettcpcnt,
                         statp->nettcpconn);
         seq_printf(seq,
-                "rpc %d %d %d\n",
+                "rpc %u %u %u\n",
                         statp->rpccnt,
                         statp->rpcretrans,
                         statp->rpcauthrefresh);
@@ -50,10 +50,10 @@ static int rpc_proc_show(struct seq_file *seq, void *v) {
                 const struct rpc_version *vers = prog->version[i];
                 if (!vers)
                         continue;
-                seq_printf(seq, "proc%d %d",
+                seq_printf(seq, "proc%u %u",
                                         vers->number, vers->nrprocs);
                 for (j = 0; j < vers->nrprocs; j++)
-                        seq_printf(seq, " %d",
+                        seq_printf(seq, " %u",
                                         vers->procs[j].p_count);
                 seq_putc(seq, '\n');
         }
@@ -83,13 +83,13 @@ void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
         int             i, j;
 
         seq_printf(seq,
-                "net %d %d %d %d\n",
+                "net %u %u %u %u\n",
                         statp->netcnt,
                         statp->netudpcnt,
                         statp->nettcpcnt,
                         statp->nettcpconn);
         seq_printf(seq,
-                "rpc %d %d %d %d %d\n",
+                "rpc %u %u %u %u %u\n",
                         statp->rpccnt,
                         statp->rpcbadfmt+statp->rpcbadauth+statp->rpcbadclnt,
                         statp->rpcbadfmt,
@@ -99,9 +99,9 @@ void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
         for (i = 0; i < prog->pg_nvers; i++) {
                 if (!(vers = prog->pg_vers[i]) || !(proc = vers->vs_proc))
                         continue;
-                seq_printf(seq, "proc%d %d", i, vers->vs_nproc);
+                seq_printf(seq, "proc%d %u", i, vers->vs_nproc);
                 for (j = 0; j < vers->vs_nproc; j++, proc++)
-                        seq_printf(seq, " %d", proc->pc_count);
+                        seq_printf(seq, " %u", proc->pc_count);
                 seq_putc(seq, '\n');
         }
 }
diff --git a/net/sunrpc/sunrpc_syms.c b/net/sunrpc/sunrpc_syms.c
index 62a073495276..ed48ff022d35 100644
--- a/net/sunrpc/sunrpc_syms.c
+++ b/net/sunrpc/sunrpc_syms.c
@@ -176,8 +176,10 @@ cleanup_sunrpc(void)
 {
         unregister_rpc_pipefs();
         rpc_destroy_mempool();
-        cache_unregister(&auth_domain_cache);
-        cache_unregister(&ip_map_cache);
+        if (cache_unregister(&auth_domain_cache))
+                printk(KERN_ERR "sunrpc: failed to unregister auth_domain cache\n");
+        if (cache_unregister(&ip_map_cache))
+                printk(KERN_ERR "sunrpc: failed to unregister ip_map cache\n");
 #ifdef RPC_DEBUG
         rpc_unregister_sysctl();
 #endif
diff --git a/net/sunrpc/svcauth.c b/net/sunrpc/svcauth.c
index bde8147ef2db..dda4f0c63511 100644
--- a/net/sunrpc/svcauth.c
+++ b/net/sunrpc/svcauth.c
@@ -143,6 +143,7 @@ static void auth_domain_drop(struct cache_head *item, struct cache_detail *cd)
 
 
 struct cache_detail auth_domain_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = DN_HASHMAX,
         .hash_table     = auth_domain_table,
         .name           = "auth.domain",
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index d6baf6fdf8a9..cac2e774dd81 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -242,6 +242,7 @@ static int ip_map_show(struct seq_file *m,
         
 
 struct cache_detail ip_map_cache = {
+        .owner          = THIS_MODULE,
         .hash_size      = IP_HASHMAX,
         .hash_table     = ip_table,
         .name           = "auth.unix.ip",
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index d0c3120d0233..05fe2e735538 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -34,7 +34,7 @@
 #include <net/sock.h>
 #include <net/checksum.h>
 #include <net/ip.h>
-#include <net/tcp.h>
+#include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
 
@@ -584,13 +584,16 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
                 /* possibly an icmp error */
                 dprintk("svc: recvfrom returned error %d\n", -err);
         }
-        if (skb->stamp.tv_sec == 0) {
-                skb->stamp.tv_sec = xtime.tv_sec; 
-                skb->stamp.tv_usec = xtime.tv_nsec / NSEC_PER_USEC; 
+        if (skb->tstamp.off_sec == 0) {
+                struct timeval tv;
+
+                tv.tv_sec = xtime.tv_sec;
+                tv.tv_usec = xtime.tv_nsec * 1000;
+                skb_set_timestamp(skb, &tv);
                 /* Don't enable netstamp, sunrpc doesn't 
                    need that much accuracy */
         }
-        svsk->sk_sk->sk_stamp = skb->stamp;
+        skb_get_timestamp(skb, &svsk->sk_sk->sk_stamp);
         set_bit(SK_DATA, &svsk->sk_flags); /* there may be more data... */
 
         /*