diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
| commit | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (patch) | |
| tree | f2cefd580d49799f5baac0593e6b70c1503410b2 /fs/nfs/nfs4renewd.c | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
| parent | cd2c5381cba9b0c40519b25841315621738688a0 (diff) | |
Merge tag 'v3.14.23' into linux-linaro-lsk-v3.14
This is the 3.14.23 stable release
Conflicts:
arch/s390/kvm/interrupt.c
Diffstat (limited to 'fs/nfs/nfs4renewd.c')
| -rw-r--r-- | fs/nfs/nfs4renewd.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfs/nfs4renewd.c b/fs/nfs/nfs4renewd.c index 1720d32ffa54..e1ba58c3d1ad 100644 --- a/fs/nfs/nfs4renewd.c +++ b/fs/nfs/nfs4renewd.c @@ -88,10 +88,18 @@ nfs4_renew_state(struct work_struct *work) } nfs_expire_all_delegations(clp); } else { + int ret; + /* Queue an asynchronous RENEW. */ - ops->sched_state_renewal(clp, cred, renew_flags); + ret = ops->sched_state_renewal(clp, cred, renew_flags); put_rpccred(cred); - goto out_exp; + switch (ret) { + default: + goto out_exp; + case -EAGAIN: + case -ENOMEM: + break; + } } } else { dprintk("%s: failed to call renewd. Reason: lease not expired \n", |