summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Brown <neilb@cse.unsw.edu.au>2005-03-09 16:52:48 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-09 16:52:48 -0800
commit1d8d931da5eeeeb249efae19012acfaaf885701a (patch)
treeee67fab349cfc7b1c7a24827b064a6d119ea601f
parentf691a02518824acb590264e5c9402aa53b2510f7 (diff)
[PATCH] nfsd4: remove dl_recall_cnt
We don't need dl_recall_cnt any more, we're just using a local variable in nfsd4_cb_recall. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/nfsd/nfs4state.c1
-rw-r--r--include/linux/nfsd/state.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index edb2e613c5ab..8146b154eedd 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -161,7 +161,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_stateid *stp, struct svc_f
dp->dl_time = 0;
atomic_set(&dp->dl_state, NFS4_NO_RECALL);
atomic_set(&dp->dl_count, 1);
- atomic_set(&dp->dl_recall_cnt, 0);
list_add(&dp->dl_del_perfile, &fp->fi_del_perfile);
list_add(&dp->dl_del_perclnt, &clp->cl_del_perclnt);
alloc_delegation++;
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index 59d497b3a6eb..5f4434d6c96d 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -86,7 +86,6 @@ struct nfs4_delegation {
struct list_head dl_del_perfile; /* nfs4_file->fi_del_perfile */
struct list_head dl_del_perclnt; /* nfs4_client->cl_del_perclnt*/
struct list_head dl_recall_lru; /* delegation recalled */
- atomic_t dl_recall_cnt; /* resend cb_recall only once */
atomic_t dl_count; /* ref count */
atomic_t dl_state; /* recall state */
struct nfs4_client *dl_client;