diff options
| -rw-r--r-- | fs/nfsd/nfs4state.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6256492b2363..48fbdac33c7c 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
| @@ -1354,8 +1354,12 @@ void nfsd_break_deleg_cb(struct file_lock *fl) | |||
| 1354 | /* only place dl_time is set. protected by lock_kernel*/ | 1354 | /* only place dl_time is set. protected by lock_kernel*/ |
| 1355 | dp->dl_time = get_seconds(); | 1355 | dp->dl_time = get_seconds(); |
| 1356 | 1356 | ||
| 1357 | /* XXX need to merge NFSD_LEASE_TIME with fs/locks.c:lease_break_time */ | 1357 | /* |
| 1358 | fl->fl_break_time = jiffies + NFSD_LEASE_TIME * HZ; | 1358 | * We don't want the locks code to timeout the lease for us; |
| 1359 | * we'll remove it ourself if the delegation isn't returned | ||
| 1360 | * in time. | ||
| 1361 | */ | ||
| 1362 | fl->fl_break_time = 0; | ||
| 1359 | 1363 | ||
| 1360 | t = kthread_run(do_recall, dp, "%s", "nfs4_cb_recall"); | 1364 | t = kthread_run(do_recall, dp, "%s", "nfs4_cb_recall"); |
| 1361 | if (IS_ERR(t)) { | 1365 | if (IS_ERR(t)) { |