aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:53 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-12-23 15:21:53 -0500
commitbd7bf9d540c001055fba796ebf146d90e4dd2eb2 (patch)
tree29f49d2244d390055126280903e9d647e10cdbd8 /include
parent9082a5cc1e33d081f091f54e6ed69a0628a4bdcc (diff)
NFSv4: Convert delegation->type field to fmode_t
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_fs.h2
-rw-r--r--include/linux/nfs_xdr.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index f11077285a6c..8d71d7b7c78a 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -180,7 +180,7 @@ struct nfs_inode {
180 /* NFSv4 state */ 180 /* NFSv4 state */
181 struct list_head open_states; 181 struct list_head open_states;
182 struct nfs_delegation *delegation; 182 struct nfs_delegation *delegation;
183 int delegation_state; 183 fmode_t delegation_state;
184 struct rw_semaphore rwsem; 184 struct rw_semaphore rwsem;
185#endif /* CONFIG_NFS_V4*/ 185#endif /* CONFIG_NFS_V4*/
186 struct inode vfs_inode; 186 struct inode vfs_inode;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index c1c31acb8a2b..32c1a0ecdbff 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -126,7 +126,7 @@ struct nfs_openargs {
126 struct iattr * attrs; /* UNCHECKED, GUARDED */ 126 struct iattr * attrs; /* UNCHECKED, GUARDED */
127 nfs4_verifier verifier; /* EXCLUSIVE */ 127 nfs4_verifier verifier; /* EXCLUSIVE */
128 nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */ 128 nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */
129 int delegation_type; /* CLAIM_PREVIOUS */ 129 fmode_t delegation_type; /* CLAIM_PREVIOUS */
130 } u; 130 } u;
131 const struct qstr * name; 131 const struct qstr * name;
132 const struct nfs_server *server; /* Needed for ID mapping */ 132 const struct nfs_server *server; /* Needed for ID mapping */
@@ -143,7 +143,7 @@ struct nfs_openres {
143 struct nfs_fattr * dir_attr; 143 struct nfs_fattr * dir_attr;
144 struct nfs_seqid * seqid; 144 struct nfs_seqid * seqid;
145 const struct nfs_server *server; 145 const struct nfs_server *server;
146 int delegation_type; 146 fmode_t delegation_type;
147 nfs4_stateid delegation; 147 nfs4_stateid delegation;
148 __u32 do_recall; 148 __u32 do_recall;
149 __u64 maxsize; 149 __u64 maxsize;