diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:30:30 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-27 07:30:30 +0900 |
| commit | 19650e8580987c0ffabc2fe2cbc16b944789df8b (patch) | |
| tree | cf0cfb390a128e3b2d47daa46f59de0a62a8ff04 /net | |
| parent | 1eb4c6362cb7d6a2f904c555c10dc45caeeefc31 (diff) | |
| parent | 0b26a0bf6ff398185546432420bb772bcfdf8d94 (diff) | |
| download | kernel_goldelico_gta04-19650e8580987c0ffabc2fe2cbc16b944789df8b.zip kernel_goldelico_gta04-19650e8580987c0ffabc2fe2cbc16b944789df8b.tar.gz kernel_goldelico_gta04-19650e8580987c0ffabc2fe2cbc16b944789df8b.tar.bz2 | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFS: Ensure we return the dirent->d_type when it is known
NFS: Correct the array bound calculation in nfs_readdir_add_to_array
NFS: Don't ignore errors from nfs_do_filldir()
NFS: Fix the error handling in "uncached_readdir()"
NFS: Fix a page leak in uncached_readdir()
NFS: Fix a page leak in nfs_do_filldir()
NFS: Assume eof if the server returns no readdir records
NFS: Buffer overflow in ->decode_dirent() should not be fatal
Pure nfs client performance using odirect.
SUNRPC: Fix an infinite loop in call_refresh/call_refreshresult
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/clnt.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 9dab957..92ce94f 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -989,20 +989,26 @@ call_refreshresult(struct rpc_task *task) dprint_status(task); task->tk_status = 0; - task->tk_action = call_allocate; - if (status >= 0 && rpcauth_uptodatecred(task)) - return; + task->tk_action = call_refresh; switch (status) { - case -EACCES: - rpc_exit(task, -EACCES); - return; - case -ENOMEM: - rpc_exit(task, -ENOMEM); + case 0: + if (rpcauth_uptodatecred(task)) + task->tk_action = call_allocate; return; case -ETIMEDOUT: rpc_delay(task, 3*HZ); + case -EAGAIN: + status = -EACCES; + if (!task->tk_cred_retry) + break; + task->tk_cred_retry--; + dprintk("RPC: %5u %s: retry refresh creds\n", + task->tk_pid, __func__); + return; } - task->tk_action = call_refresh; + dprintk("RPC: %5u %s: refresh creds failed with error %d\n", + task->tk_pid, __func__, status); + rpc_exit(task, status); } /* |