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

Commit 2b8941b9 authored by Anna Schumaker's avatar Anna Schumaker Committed by J. Bruce Fields
Browse files

NFSD: Update some as-yet unused 4.2 error codes 



Recent NFS v4.2 drafts have removed NFS4ERR_METADATA_NOTSUPP and
reassigned the error code to NFS4ERR_UNION_NOTSUPP.

I also add in the NFS4ERR_OFFLOAD_NO_REQS error code.

We're not using any of these yet, so there's no harm done.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 6cd90662

fs/nfsd/nfsd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -251,7 +251,7 @@ void nfsd_lockd_shutdown(void); 
#define nfserr_deleg_revoked		cpu_to_be32(NFS4ERR_DELEG_REVOKED)

#define nfserr_deleg_revoked		cpu_to_be32(NFS4ERR_DELEG_REVOKED)

#define nfserr_partner_notsupp		cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP)

#define nfserr_partner_notsupp		cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP)

#define nfserr_partner_no_auth		cpu_to_be32(NFS4ERR_PARTNER_NO_AUTH)

#define nfserr_partner_no_auth		cpu_to_be32(NFS4ERR_PARTNER_NO_AUTH)

#define nfserr_metadata_notsupp		cpu_to_be32(NFS4ERR_METADATA_NOTSUPP)

#define nfserr_union_notsupp		cpu_to_be32(NFS4ERR_UNION_NOTSUPP)

#define nfserr_offload_denied		cpu_to_be32(NFS4ERR_OFFLOAD_DENIED)

#define nfserr_offload_denied		cpu_to_be32(NFS4ERR_OFFLOAD_DENIED)

#define nfserr_wrong_lfs		cpu_to_be32(NFS4ERR_WRONG_LFS)

#define nfserr_wrong_lfs		cpu_to_be32(NFS4ERR_WRONG_LFS)

#define nfserr_badlabel		cpu_to_be32(NFS4ERR_BADLABEL)

#define nfserr_badlabel		cpu_to_be32(NFS4ERR_BADLABEL)

include/linux/nfs4.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -235,10 +235,11 @@ enum nfsstat4 { 
	/* nfs42 */

	/* nfs42 */

	NFS4ERR_PARTNER_NOTSUPP	= 10088,

	NFS4ERR_PARTNER_NOTSUPP	= 10088,

	NFS4ERR_PARTNER_NO_AUTH	= 10089,

	NFS4ERR_PARTNER_NO_AUTH	= 10089,

	NFS4ERR_METADATA_NOTSUPP = 10090,

	NFS4ERR_UNION_NOTSUPP = 10090,

	NFS4ERR_OFFLOAD_DENIED = 10091,

	NFS4ERR_OFFLOAD_DENIED = 10091,

	NFS4ERR_WRONG_LFS = 10092,

	NFS4ERR_WRONG_LFS = 10092,

	NFS4ERR_BADLABEL = 10093,

	NFS4ERR_BADLABEL = 10093,

	NFS4ERR_OFFLOAD_NO_REQS = 10094,

};

};





static inline bool seqid_mutating_err(u32 err)

static inline bool seqid_mutating_err(u32 err)