Skip to contentSkip to conversation

mount: make sure mount correctly when kernel not support NFSv4

PATCH In review Mi Jinlong 2 participants 4 messages Nov 25, 2010 – Nov 30, 2010

Subsystems (2)
lore
Share & tools
lore

Mi Jinlong

author
#0 lore raw

PATCH 1/1 mount: make sure mount correctly when kernel not support NFSv4

When user's nfs client(kernel) don't support NFSv4, maybe they build kernel without NFSv4, there is a problem.

When using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3 filesystem, mount will fail and get error:

"mount.nfs: an incorrect mount option was specified"

as above, the mount should success, but it fail.

When the mount command without specific NFS version, nfs-utils will try to mount NFSv4 at first, but the kernel don't support, the kernel will return with error EINVAL for parsing option (vers=4) fail.

nfs-utils should continue to try mounting NFSv3 when meeting that.

---
 utils/mount/stropts.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
utils/mount/stropts.c +4 -0
index 50a1a2a..e880c45 100644
@@ -788,6 +788,10 @@ static int nfs_autonegotiate(struct nfsmount_info *mi)
 		/* Linux servers prior to 2.6.25 may return
 		 * EPERM when NFS version 4 is not supported. */
 		goto fall_back;
+	case EINVAL:
+		/* If Linux kernel don't support NFSv4, the EINVAL
+		 * will be return for parsing option (vers=4) fail. */
+		goto fall_back;
 	default:
 		return result;
 	}
Signature · 1 line
1.7.3.2
#1 lore raw
Quoted 6 lines · Mi Jinlong

When user's nfs client(kernel) don't support NFSv4, maybe they build kernel without NFSv4, there is a problem.

When using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3 filesystem, mount will fail and get error:

Quoted 7 lines

"mount.nfs: an incorrect mount option was specified"

as above, the mount should success, but it fail.

When the mount command without specific NFS version, nfs-utils will try to mount NFSv4 at first, but the kernel don't support, the kernel will return with error EINVAL for parsing option (vers=4) fail.

Maybe the kernel should return EOPNOTSUPP in that case?

Quoted 31 lines

nfs-utils should continue to try mounting NFSv3 when meeting that.

---
utils/mount/stropts.c | 4 ++++

1 files changed, 4 insertions(+), 0 deletions(-)
utils/mount/stropts.c +4 -0
index 50a1a2a..e880c45 100644
@@ -788,6 +788,10 @@ static int nfs_autonegotiate(struct nfsmount_info *mi)
 		/* Linux servers prior to 2.6.25 may return
 		 * EPERM when NFS version 4 is not supported. */
 		goto fall_back;
+	case EINVAL:
+		/* If Linux kernel don't support NFSv4, the EINVAL
+		 * will be return for parsing option (vers=4) fail. */
+		goto fall_back;
 	default:
 		return result;
 	}
Signature · 8 lines
1.7.3.2



--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
author
#2 lore raw

Chuck Lever :

Quoted 10 lines · Mi Jinlong
Quoted 9 lines

When user's nfs client(kernel) don't support NFSv4, maybe they build kernel without NFSv4, there is a problem.

When using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3 filesystem, mount will fail and get error:

"mount.nfs: an incorrect mount option was specified"

Quoted 7 lines
Quoted 5 lines

as above, the mount should success, but it fail.

When the mount command without specific NFS version, nfs-utils will try to mount NFSv4 at first, but the kernel don't support, the kernel will return with error EINVAL for parsing option (vers=4) fail.

Maybe the kernel should return EOPNOTSUPP in that case?

Yes, what about the following patch.

--
thanks
Mi Jinlong
---------------------------------------------------------------------------------

#3 lore raw
Quoted 15 lines · Mi Jinlong

Chuck Lever :

Quoted 12 lines · Mi Jinlong
Quoted 11 lines

When user's nfs client(kernel) don't support NFSv4, maybe they build kernel without NFSv4, there is a problem.

When using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3 filesystem, mount will fail and get error:

"mount.nfs: an incorrect mount option was specified"

as above, the mount should success, but it fail.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

When the mount command without specific NFS version, nfs-utils will try to mount NFSv4 at first, but the kernel don't support, the kernel will return with error EINVAL for parsing option (vers=4) fail.

Maybe the kernel should return EOPNOTSUPP in that case?

Yes, what about the following patch.

Seems logical to me. Up to Trond...

Quoted 65 lines

--
thanks
Mi Jinlong
---------------------------------------------------------------------------------
From 4065f2571362ff301683218546151e19148fa775 Mon Sep 17 00:00:00 2001
From: Mi Jinlong <[email protected]>
Date: Sat, 30 Oct 2010 10:19:33 +0800
Subject: [PATCH] nfs: kernel should return EPROTONOSUPPORT when not support NFSv4

When nfs client(kernel) don't support NFSv4, maybe user build kernel without NFSv4, there is a problem.

Using command "mount SERVER-IP:/nfsv3 /mnt/" to mount NFSv3 filesystem, mount should should success, but fail and get error:

"mount.nfs: an incorrect mount option was specified"

System call mount "nfs"(not "nfs4") with "vers=4", if CONFIG_NFS_V4 is not defined, the "vers=4" will be parsed as invalid argument and kernel return EINVAL to nfs-utils.

About that, we really want get EPROTONOSUPPORT rather than EINVAL. This path make sure kernel parses argument success, and return EPROTONOSUPPORT at nfs_validate_mount_data().

---
fs/nfs/super.c | 4 ----

1 files changed, 0 insertions(+), 4 deletions(-)
fs/nfs/super.c +0 -4
index 3c04504..4100630 100644
@@ -1069,12 +1069,10 @@ static int nfs_parse_mount_options(char *raw,
 			mnt->flags |= NFS_MOUNT_VER3;
 			mnt->version = 3;
 			break;
-#ifdef CONFIG_NFS_V4
 		case Opt_v4:
 			mnt->flags &= ~NFS_MOUNT_VER3;
 			mnt->version = 4;
 			break;
-#endif
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
@@ -1286,12 +1284,10 @@ static int nfs_parse_mount_options(char *raw,
 				mnt->flags |= NFS_MOUNT_VER3;
 				mnt->version = 3;
 				break;
-#ifdef CONFIG_NFS_V4
 			case NFS4_VERSION:
 				mnt->flags &= ~NFS_MOUNT_VER3;
 				mnt->version = 4;
 				break;
-#endif
 			default:
 				goto out_invalid_value;
 			}
Signature · 1 line
1.7.3.2
Signature · 2 lines
Chuck Lever
chuck[dot]lever[at]oracle[dot]com