From 629e8e6a0837d33fa096b56f3f43f39292bec93b Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@citi.umich.edu>
Date: Wed, 12 Sep 2007 18:56:12 -0400
Subject: [PATCH] --- yaml --- r: 68781 b: refs/heads/master c:
 0272e1fd9f4fa8a43357c168e081744f99e67195 h: refs/heads/master i:   68779:
 a6e672a45e54ba91411e4adffdd2bac2d918bb66 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/nfsd/nfs4state.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1ea1e9bc5459..d2a7996e3a77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354ecbb9dd89c21708b319da8c4ffd3dd6e6811d
+refs/heads/master: 0272e1fd9f4fa8a43357c168e081744f99e67195
diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c
index 6256492b2363..48fbdac33c7c 100644
--- a/trunk/fs/nfsd/nfs4state.c
+++ b/trunk/fs/nfsd/nfs4state.c
@@ -1354,8 +1354,12 @@ void nfsd_break_deleg_cb(struct file_lock *fl)
 	/* only place dl_time is set. protected by lock_kernel*/
 	dp->dl_time = get_seconds();
 
-	/* XXX need to merge NFSD_LEASE_TIME with fs/locks.c:lease_break_time */
-	fl->fl_break_time = jiffies + NFSD_LEASE_TIME * HZ;
+	/*
+	 * We don't want the locks code to timeout the lease for us;
+	 * we'll remove it ourself if the delegation isn't returned
+	 * in time.
+	 */
+	fl->fl_break_time = 0;
 
 	t = kthread_run(do_recall, dp, "%s", "nfs4_cb_recall");
 	if (IS_ERR(t)) {