From abbe729dae9119aff4a6de8dce0d61ece5787456 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 12 Sep 2007 20:35:15 -0400 Subject: [PATCH] --- yaml --- r: 68783 b: refs/heads/master c: cfdcad4da1903720b9b8c1f176e46a0ebf546be3 h: refs/heads/master i: 68781: 629e8e6a0837d33fa096b56f3f43f39292bec93b 68779: a6e672a45e54ba91411e4adffdd2bac2d918bb66 68775: 8c5c561e9b303e5efb6d1f1333b63226c18f1169 68767: 6f8c8d9c3e7fbdc22f7e724c5fb51b1e30b3931d v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4callback.c | 1 + trunk/fs/nfsd/nfs4state.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4c193d472969..34b6b0c6101e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b1a9b3163a83f52ea2ac333846d4dfd2c4edd90 +refs/heads/master: cfdcad4da1903720b9b8c1f176e46a0ebf546be3 diff --git a/trunk/fs/nfsd/nfs4callback.c b/trunk/fs/nfsd/nfs4callback.c index c1cb7e009c1e..9d536a8cb379 100644 --- a/trunk/fs/nfsd/nfs4callback.c +++ b/trunk/fs/nfsd/nfs4callback.c @@ -486,6 +486,7 @@ nfsd4_cb_recall(struct nfs4_delegation *dp) /* Success or failure, now we're either waiting for lease expiration * or deleg_return. */ dprintk("NFSD: nfs4_cb_recall: dp %p dl_flock %p dl_count %d\n",dp, dp->dl_flock, atomic_read(&dp->dl_count)); + put_nfs4_client(clp); nfs4_put_delegation(dp); return; } diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index e706c6961691..6f182d25793d 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -1345,6 +1345,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) * lock) we know the server hasn't removed the lease yet, we know * it's safe to take a reference: */ atomic_inc(&dp->dl_count); + atomic_inc(&dp->dl_client->cl_count); spin_lock(&recall_lock); list_add_tail(&dp->dl_recall_lru, &del_recall_lru); @@ -1367,6 +1368,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) printk(KERN_INFO "NFSD: Callback thread failed for " "for client (clientid %08x/%08x)\n", clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id); + put_nfs4_client(dp->dl_client); nfs4_put_delegation(dp); } }