Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.21

4 files changed, 31 insertions, 26 deletions

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index aba528b9ae76..16c9fbc1db69 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -490,16 +490,14 @@ int rpc_call_sync(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
 
         /* Set up the call info struct and execute the task */
         status = task->tk_status;
-        if (status != 0) {
-                rpc_release_task(task);
+        if (status != 0)
                 goto out;
-        }
         atomic_inc(&task->tk_count);
         status = rpc_execute(task);
         if (status == 0)
                 status = task->tk_status;
-        rpc_put_task(task);
 out:
+        rpc_put_task(task);
         rpc_restore_sigmask(&oldset);
         return status;
 }
@@ -537,7 +535,7 @@ rpc_call_async(struct rpc_clnt *clnt, struct rpc_message *msg, int flags,
         if (status == 0)
                 rpc_execute(task);
         else
-                rpc_release_task(task);
+                rpc_put_task(task);
 
         rpc_restore_sigmask(&oldset);           
         return status;
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 79bc4cdf5d48..fc083f0b3544 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -42,6 +42,7 @@ static mempool_t	*rpc_buffer_mempool __read_mostly;
 static void                     __rpc_default_timer(struct rpc_task *task);
 static void                     rpciod_killall(void);
 static void                     rpc_async_schedule(struct work_struct *);
+static void                      rpc_release_task(struct rpc_task *task);
 
 /*
  * RPC tasks sit here while waiting for conditions to improve.
@@ -896,7 +897,7 @@ void rpc_put_task(struct rpc_task *task)
 }
 EXPORT_SYMBOL(rpc_put_task);
 
-void rpc_release_task(struct rpc_task *task)
+static void rpc_release_task(struct rpc_task *task)
 {
 #ifdef RPC_DEBUG
         BUG_ON(task->tk_magic != RPC_TASK_MAGIC_ID);
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index f3001f3626f6..4c1611211119 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -26,7 +26,6 @@
 #include <linux/sunrpc/clnt.h>
 
 #define RPCDBG_FACILITY RPCDBG_SVCDSP
-#define RPC_PARANOIA 1
 
 /*
  * Mode for mapping cpus to pools.
@@ -872,15 +871,15 @@ svc_process(struct svc_rqst *rqstp)
         return 0;
 
 err_short_len:
-#ifdef RPC_PARANOIA
-        printk("svc: short len %Zd, dropping request\n", argv->iov_len);
-#endif
+        if (net_ratelimit())
+                printk("svc: short len %Zd, dropping request\n", argv->iov_len);
+
         goto dropit;                    /* drop request */
 
 err_bad_dir:
-#ifdef RPC_PARANOIA
-        printk("svc: bad direction %d, dropping request\n", dir);
-#endif
+        if (net_ratelimit())
+                printk("svc: bad direction %d, dropping request\n", dir);
+
         serv->sv_stats->rpcbadfmt++;
         goto dropit;                    /* drop request */
 
@@ -909,9 +908,10 @@ err_bad_prog:
         goto sendit;
 
 err_bad_vers:
-#ifdef RPC_PARANOIA
-        printk("svc: unknown version (%d)\n", vers);
-#endif
+        if (net_ratelimit())
+                printk("svc: unknown version (%d for prog %d, %s)\n",
+                       vers, prog, progp->pg_name);
+
         serv->sv_stats->rpcbadfmt++;
         svc_putnl(resv, RPC_PROG_MISMATCH);
         svc_putnl(resv, progp->pg_lovers);
@@ -919,17 +919,17 @@ err_bad_vers:
         goto sendit;
 
 err_bad_proc:
-#ifdef RPC_PARANOIA
-        printk("svc: unknown procedure (%d)\n", proc);
-#endif
+        if (net_ratelimit())
+                printk("svc: unknown procedure (%d)\n", proc);
+
         serv->sv_stats->rpcbadfmt++;
         svc_putnl(resv, RPC_PROC_UNAVAIL);
         goto sendit;
 
 err_garbage:
-#ifdef RPC_PARANOIA
-        printk("svc: failed to decode args\n");
-#endif
+        if (net_ratelimit())
+                printk("svc: failed to decode args\n");
+
         rpc_stat = rpc_garbage_args;
 err_bad:
         serv->sv_stats->rpcbadfmt++;
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 99f54fb6d669..ff1f8bf680aa 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1062,15 +1062,19 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
                          *  bit set in the fragment length header.
                          *  But apparently no known nfs clients send fragmented
                          *  records. */
-                        printk(KERN_NOTICE "RPC: bad TCP reclen 0x%08lx (non-terminal)\n",
-                               (unsigned long) svsk->sk_reclen);
+                        if (net_ratelimit())
+                                printk(KERN_NOTICE "RPC: bad TCP reclen 0x%08lx"
+                                       " (non-terminal)\n",
+                                       (unsigned long) svsk->sk_reclen);
                         goto err_delete;
                 }
                 svsk->sk_reclen &= 0x7fffffff;
                 dprintk("svc: TCP record, %d bytes\n", svsk->sk_reclen);
                 if (svsk->sk_reclen > serv->sv_max_mesg) {
-                        printk(KERN_NOTICE "RPC: bad TCP reclen 0x%08lx (large)\n",
-                               (unsigned long) svsk->sk_reclen);
+                        if (net_ratelimit())
+                                printk(KERN_NOTICE "RPC: bad TCP reclen 0x%08lx"
+                                       " (large)\n",
+                                       (unsigned long) svsk->sk_reclen);
                         goto err_delete;
                 }
         }
@@ -1278,6 +1282,8 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
                                 schedule_timeout_uninterruptible(msecs_to_jiffies(500));
                         rqstp->rq_pages[i] = p;
                 }
+        rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */
+        BUG_ON(pages >= RPCSVC_MAXPAGES);
 
         /* Make arg->head point to first page and arg->pages point to rest */
         arg = &rqstp->rq_arg;