Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
NFS: mount option parser chokes on proto=
The new text-based NFS mount option parsing logic doesn't recognize any
valid transport protocols due to a silly mistake in the protocol token
matching logic. This prevents basic mount requests such as:
mount.nfs server:/export /mnt -o proto=tcp
from working with the new text-based NFS mount API.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
authored by Chuck Lever and committed by Trond Myklebust fdb66ff4 deee9369
+4
-4
fs/nfs/super.c
+4
-4
fs/nfs/super.c
···
911
911
kfree(string);
912
912
913
913
switch (token) {
914
-
case Opt_udp:
914
+
case Opt_xprt_udp:
915
915
mnt->flags &= ~NFS_MOUNT_TCP;
916
916
mnt->nfs_server.protocol = IPPROTO_UDP;
917
917
mnt->timeo = 7;
918
918
mnt->retrans = 5;
919
919
break;
920
-
case Opt_tcp:
920
+
case Opt_xprt_tcp:
921
921
mnt->flags |= NFS_MOUNT_TCP;
922
922
mnt->nfs_server.protocol = IPPROTO_TCP;
923
923
mnt->timeo = 600;
···
936
936
kfree(string);
937
937
938
938
switch (token) {
939
-
case Opt_udp:
939
+
case Opt_xprt_udp:
940
940
mnt->mount_server.protocol = IPPROTO_UDP;
941
941
break;
942
-
case Opt_tcp:
942
+
case Opt_xprt_tcp:
943
943
mnt->mount_server.protocol = IPPROTO_TCP;
944
944
break;
945
945
default: