UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSv4: Convert delegation->type field to fmode_t 

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2008-12-23 15:21:53 -05:00
parent 9082a5cc1e
commit bd7bf9d540
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/delegation.c
View File

@ -48,7 +48,7 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation)
set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags); set_bit(NFS_DELEGATION_REFERENCED, &delegation->flags);
} }
int nfs_have_delegation(struct inode *inode, int flags) int nfs_have_delegation(struct inode *inode, fmode_t flags)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int ret = 0; int ret = 0;

6
fs/nfs/delegation.h
View File

@ -17,7 +17,7 @@ struct nfs_delegation {
struct rpc_cred *cred; struct rpc_cred *cred;
struct inode *inode; struct inode *inode;
nfs4_stateid stateid; nfs4_stateid stateid;
int type; fmode_t type;
loff_t maxsize; loff_t maxsize;
__u64 change_attr; __u64 change_attr;
unsigned long flags; unsigned long flags;
@ -54,10 +54,10 @@ int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl);
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode); int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);
void nfs_mark_delegation_referenced(struct nfs_delegation *delegation); void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);
int nfs_have_delegation(struct inode *inode, int flags); int nfs_have_delegation(struct inode *inode, fmode_t flags);
#else #else
static inline int nfs_have_delegation(struct inode *inode, int flags) static inline int nfs_have_delegation(struct inode *inode, fmode_t flags)
{ {
return 0; return 0;
} }

4
fs/nfs/nfs4xdr.c
View File

@ -1024,7 +1024,7 @@ static void encode_opentype(struct xdr_stream *xdr, const struct nfs_openargs *a
} }
} }
static inline void encode_delegation_type(struct xdr_stream *xdr, int delegation_type) static inline void encode_delegation_type(struct xdr_stream *xdr, fmode_t delegation_type)
{ {
__be32 *p; __be32 *p;
@ -1053,7 +1053,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr *
encode_string(xdr, name->len, name->name); encode_string(xdr, name->len, name->name);
} }
static inline void encode_claim_previous(struct xdr_stream *xdr, int type) static inline void encode_claim_previous(struct xdr_stream *xdr, fmode_t type)
{ {
__be32 *p; __be32 *p;

2
include/linux/nfs_fs.h
View File

@ -180,7 +180,7 @@ struct nfs_inode {
/* NFSv4 state */ /* NFSv4 state */
struct list_head open_states; struct list_head open_states;
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
int delegation_state; fmode_t delegation_state;
struct rw_semaphore rwsem; struct rw_semaphore rwsem;
#endif /* CONFIG_NFS_V4*/ #endif /* CONFIG_NFS_V4*/
struct inode vfs_inode; struct inode vfs_inode;

4
include/linux/nfs_xdr.h
View File

@ -126,7 +126,7 @@ struct nfs_openargs {
struct iattr * attrs; /* UNCHECKED, GUARDED */ struct iattr * attrs; /* UNCHECKED, GUARDED */
nfs4_verifier verifier; /* EXCLUSIVE */ nfs4_verifier verifier; /* EXCLUSIVE */
nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */ nfs4_stateid delegation; /* CLAIM_DELEGATE_CUR */
int delegation_type; /* CLAIM_PREVIOUS */ fmode_t delegation_type; /* CLAIM_PREVIOUS */
} u; } u;
const struct qstr * name; const struct qstr * name;
const struct nfs_server *server; /* Needed for ID mapping */ const struct nfs_server *server; /* Needed for ID mapping */
@ -143,7 +143,7 @@ struct nfs_openres {
struct nfs_fattr * dir_attr; struct nfs_fattr * dir_attr;
struct nfs_seqid * seqid; struct nfs_seqid * seqid;
const struct nfs_server *server; const struct nfs_server *server;
int delegation_type; fmode_t delegation_type;
nfs4_stateid delegation; nfs4_stateid delegation;
__u32 do_recall; __u32 do_recall;
__u64 maxsize; __u64 maxsize;