Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd7bf9d5 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Convert delegation->type field to fmode_t 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9082a5cc

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void nfs_mark_delegation_referenced(struct nfs_delegation *delegation) 
	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;

	int ret = 0;

fs/nfs/delegation.h

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct nfs_delegation { 
	struct rpc_cred *cred;

	struct inode *inode;

	nfs4_stateid stateid;

	int type;

	fmode_t type;

	loff_t maxsize;

	__u64 change_attr;

	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);



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

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;

}

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -1053,7 +1053,7 @@ static inline void encode_claim_null(struct xdr_stream *xdr, const struct qstr * 
	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;

include/linux/nfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ struct nfs_inode { 
        /* NFSv4 state */

	struct list_head	open_states;

	struct nfs_delegation	*delegation;

	int			 delegation_state;

	fmode_t			 delegation_state;

	struct rw_semaphore	rwsem;

#endif /* CONFIG_NFS_V4*/

	struct inode		vfs_inode;

include/linux/nfs_xdr.h

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct nfs_openargs { 
		struct iattr *  attrs;    /* UNCHECKED, GUARDED */

		nfs4_verifier   verifier; /* EXCLUSIVE */

		nfs4_stateid	delegation;		/* CLAIM_DELEGATE_CUR */

		int		delegation_type;	/* CLAIM_PREVIOUS */

		fmode_t		delegation_type;	/* CLAIM_PREVIOUS */

	} u;

	const struct qstr *	name;

	const struct nfs_server *server;	 /* Needed for ID mapping */
@@ -143,7 +143,7 @@ struct nfs_openres { 
	struct nfs_fattr *      dir_attr;

	struct nfs_seqid *	seqid;

	const struct nfs_server *server;

	int			delegation_type;

	fmode_t			delegation_type;

	nfs4_stateid		delegation;

	__u32			do_recall;

	__u64			maxsize;