1 files changed, 7 insertions, 18 deletions

diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 090af78d68b5..d74c2d269539 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -510,8 +510,7 @@ EXPORT_SYMBOL(svc_destroy);
 static int
 svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
 {
-        int pages;
-        int arghi;
+        unsigned int pages, arghi;
 
         pages = size / PAGE_SIZE + 1; /* extra page as we hold both request and reply.
                                        * We assume one is at most one page
@@ -525,7 +524,7 @@ svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
                 rqstp->rq_pages[arghi++] = p;
                 pages--;
         }
-        return ! pages;
+        return pages == 0;
 }
 
 /*
@@ -534,8 +533,9 @@ svc_init_buffer(struct svc_rqst *rqstp, unsigned int size)
 static void
 svc_release_buffer(struct svc_rqst *rqstp)
 {
-        int i;
-        for (i=0; i<ARRAY_SIZE(rqstp->rq_pages); i++)
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(rqstp->rq_pages); i++)
                 if (rqstp->rq_pages[i])
                         put_page(rqstp->rq_pages[i]);
 }
@@ -590,7 +590,7 @@ __svc_create_thread(svc_thread_fn func, struct svc_serv *serv,
         struct svc_rqst *rqstp;
         int             error = -ENOMEM;
         int             have_oldmask = 0;
-        cpumask_t       oldmask;
+        cpumask_t       uninitialized_var(oldmask);
 
         rqstp = svc_prepare_thread(serv, pool);
         if (IS_ERR(rqstp)) {
@@ -619,16 +619,6 @@ out_thread:
 }
 
 /*
- * Create a thread in the default pool.  Caller must hold BKL.
- */
-int
-svc_create_thread(svc_thread_fn func, struct svc_serv *serv)
-{
-        return __svc_create_thread(func, serv, &serv->sv_pools[0]);
-}
-EXPORT_SYMBOL(svc_create_thread);
-
-/*
  * Choose a pool in which to create a new thread, for svc_set_num_threads
  */
 static inline struct svc_pool *
@@ -921,8 +911,7 @@ svc_process(struct svc_rqst *rqstp)
         case SVC_OK:
                 break;
         case SVC_GARBAGE:
-                rpc_stat = rpc_garbage_args;
-                goto err_bad;
+                goto err_garbage;
         case SVC_SYSERR:
                 rpc_stat = rpc_system_err;
                 goto err_bad;