mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 10:19:47 +00:00
NFS: Fix the NFS users of rpc_restart_call()
Fix up those functions that depend on knowing whether or not rpc_restart_call is successful or not. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
f1f88fc7e8
commit
d05dd4e98f
2 changed files with 4 additions and 7 deletions
|
@ -369,10 +369,9 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len)
|
|||
* Helper for restarting RPC calls in the possible presence of NFSv4.1
|
||||
* sessions.
|
||||
*/
|
||||
static inline void nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
|
||||
static inline int nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)
|
||||
{
|
||||
if (nfs4_has_session(clp))
|
||||
rpc_restart_call_prepare(task);
|
||||
else
|
||||
rpc_restart_call(task);
|
||||
return rpc_restart_call_prepare(task);
|
||||
return rpc_restart_call(task);
|
||||
}
|
||||
|
|
|
@ -446,9 +446,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
|
|||
nfs41_sequence_free_slot(res);
|
||||
return 1;
|
||||
out_retry:
|
||||
rpc_restart_call(task);
|
||||
/* FIXME: rpc_restart_call() should be made to return success/fail */
|
||||
if (task->tk_action == NULL)
|
||||
if (!rpc_restart_call(task))
|
||||
goto out;
|
||||
rpc_delay(task, NFS4_POLL_RETRY_MAX);
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue