| Message ID | 1409152678-7806-2-git-send-email-bjschuma@netapp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 27, 2014 at 11:17:56AM -0400, bjschuma@netapp.com wrote: > From: Anna Schumaker <Anna.Schumaker@netapp.com> > > Recent NFS v4.2 drafts have removed NFS4ERR_METADATA_NOTSUPP and > reassigned the error code to NFS4ERR_UNION_NOTSUPP. And these have no users, so fine. Applying. --b. > > I also add in the NFS4ERR_OFFLOAD_NO_REQS error code. > > Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> > --- > fs/nfsd/nfsd.h | 2 +- > include/linux/nfs4.h | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h > index 847daf3..747f3b95 100644 > --- a/fs/nfsd/nfsd.h > +++ b/fs/nfsd/nfsd.h > @@ -251,7 +251,7 @@ void nfsd_lockd_shutdown(void); > #define nfserr_deleg_revoked cpu_to_be32(NFS4ERR_DELEG_REVOKED) > #define nfserr_partner_notsupp cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP) > #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_wrong_lfs cpu_to_be32(NFS4ERR_WRONG_LFS) > #define nfserr_badlabel cpu_to_be32(NFS4ERR_BADLABEL) > diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h > index a1e3064..79b2a0f 100644 > --- a/include/linux/nfs4.h > +++ b/include/linux/nfs4.h > @@ -235,10 +235,11 @@ enum nfsstat4 { > /* nfs42 */ > NFS4ERR_PARTNER_NOTSUPP = 10088, > NFS4ERR_PARTNER_NO_AUTH = 10089, > - NFS4ERR_METADATA_NOTSUPP = 10090, > + NFS4ERR_UNION_NOTSUPP = 10090, > NFS4ERR_OFFLOAD_DENIED = 10091, > NFS4ERR_WRONG_LFS = 10092, > NFS4ERR_BADLABEL = 10093, > + NFS4ERR_OFFLOAD_NO_REQS = 10094, > }; > > static inline bool seqid_mutating_err(u32 err) > -- > 2.1.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 847daf3..747f3b95 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -251,7 +251,7 @@ void nfsd_lockd_shutdown(void); #define nfserr_deleg_revoked cpu_to_be32(NFS4ERR_DELEG_REVOKED) #define nfserr_partner_notsupp cpu_to_be32(NFS4ERR_PARTNER_NOTSUPP) #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_wrong_lfs cpu_to_be32(NFS4ERR_WRONG_LFS) #define nfserr_badlabel cpu_to_be32(NFS4ERR_BADLABEL) diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index a1e3064..79b2a0f 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h @@ -235,10 +235,11 @@ enum nfsstat4 { /* nfs42 */ NFS4ERR_PARTNER_NOTSUPP = 10088, NFS4ERR_PARTNER_NO_AUTH = 10089, - NFS4ERR_METADATA_NOTSUPP = 10090, + NFS4ERR_UNION_NOTSUPP = 10090, NFS4ERR_OFFLOAD_DENIED = 10091, NFS4ERR_WRONG_LFS = 10092, NFS4ERR_BADLABEL = 10093, + NFS4ERR_OFFLOAD_NO_REQS = 10094, }; static inline bool seqid_mutating_err(u32 err)