Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

* 'for-linus' of git://linux-nfs.org/~bfields/linux:
  SUNPRC: Fix printk format warning
  nfsd: clean up svc_reserve_auth()
  NLM: don't requeue block if it was invalidated while GRANT_MSG was in flight
  NLM: don't reattempt GRANT_MSG when there is already an RPC in flight
  NLM: have server-side RPC clients default to soft RPC tasks
  NLM: set RPC_CLNT_CREATE_NOPING for NLM RPC clients

1 files changed, 5 insertions, 8 deletions

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index 64c771056187..64c97552964a 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -409,16 +409,13 @@ char *		   svc_print_addr(struct svc_rqst *, char *, size_t);
  * for all cases without actually generating the checksum, so we just use a
  * static value.
  */
-static inline void
-svc_reserve_auth(struct svc_rqst *rqstp, int space)
+static inline void svc_reserve_auth(struct svc_rqst *rqstp, int space)
 {
-        int                     added_space = 0;
+        int added_space = 0;
 
-        switch(rqstp->rq_authop->flavour) {
-                case RPC_AUTH_GSS:
-                        added_space = RPC_MAX_AUTH_SIZE;
-        }
-        return svc_reserve(rqstp, space + added_space);
+        if (rqstp->rq_authop->flavour)
+                added_space = RPC_MAX_AUTH_SIZE;
+        svc_reserve(rqstp, space + added_space);
 }
 
 #endif /* SUNRPC_SVC_H */