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: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 847daf37e5664185285330da81c35f5b2ad7dbbe..747f3b95bd11118aa477153fa97594127e2fbc1c 100644 (file)
--- 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 a1e3064a8d99ee3449f693193d3237c10c388505..79b2a0f5c318a9510d91babd41fb2d1673552708 100644 (file)
--- 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)