summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/state.h
diff options
context:
space:
mode:
authorTrond Myklebust2014-07-21 15:34:58 +0200
committerJ. Bruce Fields2014-07-21 23:03:00 +0200
commit72c0b0fb9f8a24612b6c33c8adf9e9406818981b (patch)
treebd7da695536fd1b00281f126619d00b273a10159 /fs/nfsd/state.h
parentnfsd: fix race that grants unrecallable delegation (diff)
downloadkernel-qcow2-linux-72c0b0fb9f8a24612b6c33c8adf9e9406818981b.tar.gz
kernel-qcow2-linux-72c0b0fb9f8a24612b6c33c8adf9e9406818981b.tar.xz
kernel-qcow2-linux-72c0b0fb9f8a24612b6c33c8adf9e9406818981b.zip
nfsd: Move the delegation reference counter into the struct nfs4_stid
We will want to add reference counting to the lock stateid and open stateids too in later patches. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
-rw-r--r--fs/nfsd/state.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 996d61eeb357..e68a9ae30fd7 100644
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -73,6 +73,7 @@ struct nfsd4_callback {
};
struct nfs4_stid {
+ atomic_t sc_count;
#define NFS4_OPEN_STID 1
#define NFS4_LOCK_STID 2
#define NFS4_DELEG_STID 4
@@ -91,7 +92,6 @@ struct nfs4_delegation {
struct list_head dl_perfile;
struct list_head dl_perclnt;
struct list_head dl_recall_lru; /* delegation recalled */
- atomic_t dl_count; /* ref count */
struct nfs4_file *dl_file;
u32 dl_type;
time_t dl_time;