diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:53 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-23 15:21:53 -0500 |
commit | bd7bf9d540c001055fba796ebf146d90e4dd2eb2 (patch) | |
tree | 29f49d2244d390055126280903e9d647e10cdbd8 /fs/nfs | |
parent | 9082a5cc1e33d081f091f54e6ed69a0628a4bdcc (diff) |
NFSv4: Convert delegation->type field to fmode_t
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/delegation.c | 2 | ||||
-rw-r--r-- | fs/nfs/delegation.h | 6 | ||||
-rw-r--r-- | fs/nfs/nfs4xdr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index e75f2f8c5245..968225a88015 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -48,7 +48,7 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation) | |||
48 | set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags); | 48 | set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags); |
49 | } | 49 | } |
50 | 50 | ||
51 | int nfs_have_delegation(struct inode *inode, int flags) | 51 | int nfs_have_delegation(struct inode *inode, fmode_t flags) |
52 | { | 52 | { |
53 | struct nfs_delegation *delegation; | 53 | struct nfs_delegation *delegation; |
54 | int ret = 0; | 54 | int ret = 0; |
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h index 2a74882e5d50..09f383795174 100644 --- a/fs/nfs/delegation.h +++ b/fs/nfs/delegation.h | |||
@@ -17,7 +17,7 @@ struct nfs_delegation { | |||
17 | struct rpc_cred *cred; | 17 | struct rpc_cred *cred; |
18 | struct inode *inode; | 18 | struct inode *inode; |
19 | nfs4_stateid stateid; | 19 | nfs4_stateid stateid; |
20 | int type; | 20 | fmode_t type; |
21 | loff_t maxsize; | 21 | loff_t maxsize; |
22 | __u64 change_attr; | 22 | __u64 change_attr; |
23 | unsigned long flags; | 23 | unsigned long flags; |
@@ -54,10 +54,10 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl); | |||
54 | int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode); | 54 | int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode); |
55 | 55 | ||
56 | void nfs_mark_delegation_referenced(struct nfs_delegation *delegation); | 56 | void nfs_mark_delegation_referenced(struct nfs_delegation *delegation); |
57 | int nfs_have_delegation(struct inode *inode, int flags); | 57 | int nfs_have_delegation(struct inode *inode, fmode_t flags); |
58 | 58 | ||
59 | #else | 59 | #else |
60 | static inline int nfs_have_delegation(struct inode *inode, int flags) | 60 | static inline int nfs_have_delegation(struct inode *inode, fmode_t flags) |
61 | { | 61 | { |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index b916297d2334..879911c99030 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -1024,7 +1024,7 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a | |||
1024 | } | 1024 | } |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) | 1027 | static inline void encode_delegation_type(struct xdr_stream *xdr, fmode_t delegation_type) |
1028 | { | 1028 | { |
1029 | __be32 *p; | 1029 | __be32 *p; |
1030 | 1030 | ||
@@ -1053,7 +1053,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr * | |||
1053 | encode_string(xdr, name->len, name->name); | 1053 | encode_string(xdr, name->len, name->name); |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | static inline void encode_claim_previous(struct xdr_stream *xdr, int type) | 1056 | static inline void encode_claim_previous(struct xdr_stream *xdr, fmode_t type) |
1057 | { | 1057 | { |
1058 | __be32 *p; | 1058 | __be32 *p; |
1059 | 1059 | ||