Skip to contentSkip to conversation

NFS: Don't specify NFS version in "UDP not supported" error

PATCH New Petr Vorel 1 participant 1 message Mar 24, 2020

Subsystems (2)
lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 NFS: Don't specify NFS version in "UDP not supported" error

UDP was originally disabled in 6da1a034362f for NFSv4. Later in b24ee6c64ca7 UDP is by default disabled by NFS_DISABLE_UDP_SUPPORT=y for all NFS versions. Therefore remove v4 from error message.

Fixes b24ee6c64ca7 ("NFS: allow deprecation of NFS UDP protocol")

---
Hi,

although on NFS_DISABLE_UDP_SUPPORT=n it might be confusing that version is not specified, IMHO it's less confusing than "NFSv4" for NFSv3. But if you like I can distinguish these two cases.

Kind regards,
Petr

 fs/nfs/fs_context.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
fs/nfs/fs_context.c +2 -2
index e113fcb4bb4c..566dd59570e6 100644
@@ -1135,7 +1135,7 @@ static int nfs4_parse_monolithic(struct fs_context *fc,
 	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 @@ static int nfs_fs_context_validate(struct fs_context *fc)
 	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:
Signature · 1 line
2.25.1