lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2008-02-11 09:19:47 -08:00
parent eedcdefb1a bb50c8012c
commit 0c0d61ca93
4 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/sunrpc/svc.h
View File

@ -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 */