diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-09-12 20:35:15 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:31:57 -0400 |
commit | cfdcad4da1903720b9b8c1f176e46a0ebf546be3 (patch) | |
tree | 8c8b12074a5d197c427c4907f41492d556da2dd5 /fs/nfsd/nfs4state.c | |
parent | 1b1a9b3163a83f52ea2ac333846d4dfd2c4edd90 (diff) |
knfsd: nfsv4 delegation recall should take reference on client
It's not enough to take a reference on the delegation object itself; we
need to ensure that the rpc_client won't go away just as we're about to
make an rpc call.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e706c6961691..6f182d25793d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1345,6 +1345,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) | |||
1345 | * lock) we know the server hasn't removed the lease yet, we know | 1345 | * lock) we know the server hasn't removed the lease yet, we know |
1346 | * it's safe to take a reference: */ | 1346 | * it's safe to take a reference: */ |
1347 | atomic_inc(&dp->dl_count); | 1347 | atomic_inc(&dp->dl_count); |
1348 | atomic_inc(&dp->dl_client->cl_count); | ||
1348 | 1349 | ||
1349 | spin_lock(&recall_lock); | 1350 | spin_lock(&recall_lock); |
1350 | list_add_tail(&dp->dl_recall_lru, &del_recall_lru); | 1351 | list_add_tail(&dp->dl_recall_lru, &del_recall_lru); |
@@ -1367,6 +1368,7 @@ void nfsd_break_deleg_cb(struct file_lock *fl) | |||
1367 | printk(KERN_INFO "NFSD: Callback thread failed for " | 1368 | printk(KERN_INFO "NFSD: Callback thread failed for " |
1368 | "for client (clientid %08x/%08x)\n", | 1369 | "for client (clientid %08x/%08x)\n", |
1369 | clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id); | 1370 | clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id); |
1371 | put_nfs4_client(dp->dl_client); | ||
1370 | nfs4_put_delegation(dp); | 1372 | nfs4_put_delegation(dp); |
1371 | } | 1373 | } |
1372 | } | 1374 | } |