Merge /spare/repo/linux-2.6/

6 files changed, 24 insertions, 16 deletions

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/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",