]> git.baikalelectronics.ru Git - kernel.git/commitdiff
NFS: Don't specify NFS version in "UDP not supported" error
authorPetr Vorel <pvorel@suse.cz>
Tue, 24 Mar 2020 20:08:49 +0000 (21:08 +0100)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Wed, 25 Mar 2020 12:46:34 +0000 (08:46 -0400)
UDP was originally disabled in 8d65393d01a1 for NFSv4. Later in
5f894806808d UDP is by default disabled by NFS_DISABLE_UDP_SUPPORT=y for
all NFS versions. Therefore remove v4 from error message.

Fixes: 5f894806808d ("NFS: allow deprecation of NFS UDP protocol")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/fs_context.c

index e113fcb4bb4c4b7cdfe704cf568ac27430a6b9b3..566dd59570e68a8ec3ccd051530cc2250776db2b 100644 (file)
@@ -1135,7 +1135,7 @@ out_no_address:
        return nfs_invalf(fc, "NFS4: mount program didn't pass remote address");
 
 out_invalid_transport_udp:
-       return nfs_invalf(fc, "NFSv4: Unsupported transport protocol udp");
+       return nfs_invalf(fc, "NFS: Unsupported transport protocol udp");
 }
 #endif
 
@@ -1257,7 +1257,7 @@ out_v4_not_compiled:
        nfs_errorf(fc, "NFS: NFSv4 is not compiled into kernel");
        return -EPROTONOSUPPORT;
 out_invalid_transport_udp:
-       return nfs_invalf(fc, "NFSv4: Unsupported transport protocol udp");
+       return nfs_invalf(fc, "NFS: Unsupported transport protocol udp");
 out_no_address:
        return nfs_invalf(fc, "NFS: mount program didn't pass remote address");
 out_mountproto_mismatch: