NFS/knfsd: Remove the invalid NFS error 'NFSERR_OPNOTSUPP'

NFSERR_OPNOTSUPP is not described by any RFC, and should not be used.

Signed-off-by: Trond Myklebust <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>

diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 2f6c6f3815b4d29cae11e863d62dc969e442eaef..8f4f239d9f8a1bae56b888f869ab5e775cf8f84f 100644 (file)
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -230,7 +230,6 @@ void                nfsd_lockd_shutdown(void);
 #define        nfserr_nospc            cpu_to_be32(NFSERR_NOSPC)
 #define        nfserr_rofs             cpu_to_be32(NFSERR_ROFS)
 #define        nfserr_mlink            cpu_to_be32(NFSERR_MLINK)
-#define        nfserr_opnotsupp        cpu_to_be32(NFSERR_OPNOTSUPP)
 #define        nfserr_nametoolong      cpu_to_be32(NFSERR_NAMETOOLONG)
 #define        nfserr_notempty         cpu_to_be32(NFSERR_NOTEMPTY)
 #define        nfserr_dquot            cpu_to_be32(NFSERR_DQUOT)

diff --git a/include/trace/misc/nfs.h b/include/trace/misc/nfs.h
index e43e745915618e53762915436cb248cba1a71005..7b221d51133a8230663430b3ecb85a1594c40ec8 100644 (file)
--- a/include/trace/misc/nfs.h
+++ b/include/trace/misc/nfs.h
@@ -28,7 +28,6 @@ TRACE_DEFINE_ENUM(NFSERR_FBIG);
 TRACE_DEFINE_ENUM(NFSERR_NOSPC);
 TRACE_DEFINE_ENUM(NFSERR_ROFS);
 TRACE_DEFINE_ENUM(NFSERR_MLINK);
-TRACE_DEFINE_ENUM(NFSERR_OPNOTSUPP);
 TRACE_DEFINE_ENUM(NFSERR_NAMETOOLONG);
 TRACE_DEFINE_ENUM(NFSERR_NOTEMPTY);
 TRACE_DEFINE_ENUM(NFSERR_DQUOT);
@@ -64,7 +63,6 @@ TRACE_DEFINE_ENUM(NFSERR_JUKEBOX);
                { NFSERR_NOSPC,                 "NOSPC" }, \
                { NFSERR_ROFS,                  "ROFS" }, \
                { NFSERR_MLINK,                 "MLINK" }, \
-               { NFSERR_OPNOTSUPP,             "OPNOTSUPP" }, \
                { NFSERR_NAMETOOLONG,           "NAMETOOLONG" }, \
                { NFSERR_NOTEMPTY,              "NOTEMPTY" }, \
                { NFSERR_DQUOT,                 "DQUOT" }, \

diff --git a/include/uapi/linux/nfs.h b/include/uapi/linux/nfs.h
index 946cb62d64b0b87805e9ae0e4ff4cafb40335d5b..f356f2ba3814284064a54e76bae0db7ee6158882 100644 (file)
--- a/include/uapi/linux/nfs.h
+++ b/include/uapi/linux/nfs.h
@@ -61,7 +61,6 @@
        NFSERR_NOSPC = 28,              /* v2 v3 v4 */
        NFSERR_ROFS = 30,               /* v2 v3 v4 */
        NFSERR_MLINK = 31,              /*    v3 v4 */
-       NFSERR_OPNOTSUPP = 45,          /* v2 v3 */
        NFSERR_NAMETOOLONG = 63,        /* v2 v3 v4 */
        NFSERR_NOTEMPTY = 66,           /* v2 v3 v4 */
        NFSERR_DQUOT = 69,              /* v2 v3 v4 */