[PATCH 1/3] NFS: Extend the -overs= mount option to allow 4.x minorversions

[PATCH 1/3] NFS: Extend the -overs= mount option to allow 4.x minorversions

[Trond Myklebust]

Allow the user to mount an NFSv4.0 or NFSv4.1 partition using a
standard syntax of '-overs=4.0', or '-overs=4.1' rather than the
more cumbersome '-overs=4,minorversion=1'.

See also the earlier patch by Dros Adamson, which added the
Linux-specific syntax '-ov4.0', '-ov4.1'.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
 fs/nfs/super.c |   84 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 8154acc..ab58bb9 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -98,10 +98,10 @@ enum {
 	Opt_namelen,
 	Opt_mountport,
 	Opt_mountvers,
-	Opt_nfsvers,
 	Opt_minorversion,
 
 	/* Mount options that take string arguments */
+	Opt_nfsvers,
 	Opt_sec, Opt_proto, Opt_mountproto, Opt_mounthost,
 	Opt_addr, Opt_mountaddr, Opt_clientaddr,
 	Opt_lookupcache,
@@ -166,9 +166,10 @@ static const match_table_t nfs_mount_option_tokens = {
 	{ Opt_namelen, "namlen=%s" },
 	{ Opt_mountport, "mountport=%s" },
 	{ Opt_mountvers, "mountvers=%s" },
+	{ Opt_minorversion, "minorversion=%s" },
+
 	{ Opt_nfsvers, "nfsvers=%s" },
 	{ Opt_nfsvers, "vers=%s" },
-	{ Opt_minorversion, "minorversion=%s" },
 
 	{ Opt_sec, "sec=%s" },
 	{ Opt_proto, "proto=%s" },
@@ -262,6 +263,22 @@ static match_table_t nfs_local_lock_tokens = {
 	{ Opt_local_lock_err, NULL }
 };
 
+enum {
+	Opt_vers_2, Opt_vers_3, Opt_vers_4, Opt_vers_4_0,
+	Opt_vers_4_1,
+
+	Opt_vers_err
+};
+
+static match_table_t nfs_vers_tokens = {
+	{ Opt_vers_2, "2" },
+	{ Opt_vers_3, "3" },
+	{ Opt_vers_4, "4" },
+	{ Opt_vers_4_0, "4.0" },
+	{ Opt_vers_4_1, "4.1" },
+
+	{ Opt_vers_err, NULL }
+};
 
 static void nfs_umount_begin(struct super_block *);
 static int  nfs_statfs(struct dentry *, struct kstatfs *);
@@ -1064,6 +1081,40 @@ static int nfs_parse_security_flavors(char *value,
 	return 1;
 }
 
+static int nfs_parse_version_string(char *string,
+		struct nfs_parsed_mount_data *mnt,
+		substring_t *args)
+{
+	mnt->flags &= ~NFS_MOUNT_VER3;
+	switch (match_token(string, nfs_vers_tokens, args)) {
+	case Opt_vers_2:
+		mnt->version = 2;
+		break;
+	case Opt_vers_3:
+		mnt->flags |= NFS_MOUNT_VER3;
+		mnt->version = 3;
+		break;
+	case Opt_vers_4:
+		/* Backward compatibility option. In future,
+		 * the mount program should always supply
+		 * a NFSv4 minor version number.
+		 */
+		mnt->version = 4;
+		break;
+	case Opt_vers_4_0:
+		mnt->version = 4;
+		mnt->minorversion = 0;
+		break;
+	case Opt_vers_4_1:
+		mnt->version = 4;
+		mnt->minorversion = 1;
+		break;
+	default:
+		return 0;
+	}
+	return 1;
+}
+
 static int nfs_get_option_str(substring_t args[], char **option)
 {
 	kfree(*option);
@@ -1317,26 +1368,6 @@ static int nfs_parse_mount_options(char *raw,
 				goto out_invalid_value;
 			mnt->mount_server.version = option;
 			break;
-		case Opt_nfsvers:
-			if (nfs_get_option_ul(args, &option))
-				goto out_invalid_value;
-			switch (option) {
-			case NFS2_VERSION:
-				mnt->flags &= ~NFS_MOUNT_VER3;
-				mnt->version = 2;
-				break;
-			case NFS3_VERSION:
-				mnt->flags |= NFS_MOUNT_VER3;
-				mnt->version = 3;
-				break;
-			case NFS4_VERSION:
-				mnt->flags &= ~NFS_MOUNT_VER3;
-				mnt->version = 4;
-				break;
-			default:
-				goto out_invalid_value;
-			}
-			break;
 		case Opt_minorversion:
 			if (nfs_get_option_ul(args, &option))
 				goto out_invalid_value;
@@ -1348,6 +1379,15 @@ static int nfs_parse_mount_options(char *raw,
 		/*
 		 * options that take text values
 		 */
+		case Opt_nfsvers:
+			string = match_strdup(args);
+			if (string == NULL)
+				goto out_nomem;
+			rc = nfs_parse_version_string(string, mnt, args);
+			kfree(string);
+			if (!rc)
+				goto out_invalid_value;
+			break;
 		case Opt_sec:
 			string = match_strdup(args);
 			if (string == NULL)
-- 
1.7.7.6

[PATCH 2/3] NFS: Ensure we display the minor version correctly in /proc/mounts etc.

[Trond Myklebust]

The 'minorversion' mount option is now deprecated, so we need to display
the minor version number in the 'vers=' format.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
 fs/nfs/super.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index ab58bb9..7f0c93f 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -640,7 +640,6 @@ static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss,
 	struct nfs_client *clp = nfss->nfs_client;
 
 	seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr);
-	seq_printf(m, ",minorversion=%u", clp->cl_minorversion);
 }
 #else
 static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss,
@@ -649,6 +648,15 @@ static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss,
 }
 #endif
 
+static void nfs_show_nfs_version(struct seq_file *m,
+		unsigned int version,
+		unsigned int minorversion)
+{
+	seq_printf(m, ",vers=%u", version);
+	if (version == 4)
+		seq_printf(m, ".%u", minorversion);
+}
+
 /*
  * Describe the mount options in force on this server representation
  */
@@ -676,7 +684,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
 	u32 version = clp->rpc_ops->version;
 	int local_flock, local_fcntl;
 
-	seq_printf(m, ",vers=%u", version);
+	nfs_show_nfs_version(m, version, clp->cl_minorversion);
 	seq_printf(m, ",rsize=%u", nfss->rsize);
 	seq_printf(m, ",wsize=%u", nfss->wsize);
 	if (nfss->bsize != 0)
-- 
1.7.7.6

[PATCH 3/3] NFS: Consolidate the parsing of the '-ov4.x' and '-overs=4.x' mount options

[Trond Myklebust]

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---
 fs/nfs/super.c |   31 +++----------------------------
 1 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 7f0c93f..f4ccdae 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -80,7 +80,6 @@ enum {
 	Opt_cto, Opt_nocto,
 	Opt_ac, Opt_noac,
 	Opt_lock, Opt_nolock,
-	Opt_v2, Opt_v3, Opt_v4, Opt_v4_0, Opt_v4_1,
 	Opt_udp, Opt_tcp, Opt_rdma,
 	Opt_acl, Opt_noacl,
 	Opt_rdirplus, Opt_nordirplus,
@@ -133,11 +132,6 @@ static const match_table_t nfs_mount_option_tokens = {
 	{ Opt_noac, "noac" },
 	{ Opt_lock, "lock" },
 	{ Opt_nolock, "nolock" },
-	{ Opt_v2, "v2" },
-	{ Opt_v3, "v3" },
-	{ Opt_v4, "v4" },
-	{ Opt_v4_0, "v4.0" },
-	{ Opt_v4_1, "v4.1" },
 	{ Opt_udp, "udp" },
 	{ Opt_tcp, "tcp" },
 	{ Opt_rdma, "rdma" },
@@ -183,6 +177,9 @@ static const match_table_t nfs_mount_option_tokens = {
 	{ Opt_fscache_uniq, "fsc=%s" },
 	{ Opt_local_lock, "local_lock=%s" },
 
+	/* The following needs to be listed after all other options */
+	{ Opt_nfsvers, "v%s" },
+
 	{ Opt_err, NULL }
 };
 
@@ -1228,28 +1225,6 @@ static int nfs_parse_mount_options(char *raw,
 			mnt->flags |= (NFS_MOUNT_LOCAL_FLOCK |
 				       NFS_MOUNT_LOCAL_FCNTL);
 			break;
-		case Opt_v2:
-			mnt->flags &= ~NFS_MOUNT_VER3;
-			mnt->version = 2;
-			break;
-		case Opt_v3:
-			mnt->flags |= NFS_MOUNT_VER3;
-			mnt->version = 3;
-			break;
-		case Opt_v4:
-			mnt->flags &= ~NFS_MOUNT_VER3;
-			mnt->version = 4;
-			break;
-		case Opt_v4_0:
-			mnt->flags &= ~NFS_MOUNT_VER3;
-			mnt->version = 4;
-			mnt->minorversion = 0;
-			break;
-		case Opt_v4_1:
-			mnt->flags &= ~NFS_MOUNT_VER3;
-			mnt->version = 4;
-			mnt->minorversion = 1;
-			break;
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
-- 
1.7.7.6

Re: [PATCH 3/3] NFS: Consolidate the parsing of the '-ov4.x' and '-overs=4.x' mount options

[Myklebust, Trond]

U3RldmUsDQoNCldoZW4gdGVzdGluZyB0aGlzIHBhdGNoLCBJIG5vdGljZWQgdGhhdCB0aGUgJ21v
dW50JyBwcm9ncmFtIHNlZW1zIHRvIGJlDQphZGRpbmcgYSAndmVycz00JyB0byBteSBtb3VudCBv
cHRpb25zLg0KDQpJT1c6IHdoZW4gSSB0ZXN0ZWQgdGhlIGZvbGxvd2luZyBtb3VudCBjb21tYW5k
Og0KDQogICAgICAgIG1vdW50IC10IG5mcyAtb3Y0LjEgZm9vOi9iYXIgL21udA0KDQp0aGUga2Vy
bmVsIGVuZGVkIHVwIHBhcnNpbmcNCg0KICAgJ3Y0LjEsdmVycz00LGFkZHI9eHh4Lnh4eC54eHgu
eHh4LCBjbGllbnRhZGRyPXl5eS55eXkueXl5Lnl5eScNCg0Kd2hpY2ggY2F1c2VkIGEgYnVnIGlu
IG15IG9yaWdpbmFsIHBhdGNoZXMgKHdoZXJlIEkgaGFkICd2ZXJzPTQnDQphdXRvbWF0aWNhbGx5
IHNldCBtaW5vcnZlcnNpb249MCkuDQoNCkFueSBpZGVhIHdoeSB3ZSdyZSBhZGRpbmcgdGhhdCBl
eHRyYSB2ZXJzPTQ/DQoNCkNoZWVycw0KICBUcm9uZA0KDQpPbiBGcmksIDIwMTItMDMtMDIgYXQg
MTQ6MDcgLTA1MDAsIFRyb25kIE15a2xlYnVzdCB3cm90ZToNCj4gU2lnbmVkLW9mZi1ieTogVHJv
bmQgTXlrbGVidXN0IDxUcm9uZC5NeWtsZWJ1c3RAbmV0YXBwLmNvbT4NCj4gLS0tDQo+ICBmcy9u
ZnMvc3VwZXIuYyB8ICAgMzEgKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KPiAgMSBm
aWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQ0KPiANCj4gZGlm
ZiAtLWdpdCBhL2ZzL25mcy9zdXBlci5jIGIvZnMvbmZzL3N1cGVyLmMNCj4gaW5kZXggN2YwYzkz
Zi4uZjRjY2RhZSAxMDA2NDQNCj4gLS0tIGEvZnMvbmZzL3N1cGVyLmMNCj4gKysrIGIvZnMvbmZz
L3N1cGVyLmMNCj4gQEAgLTgwLDcgKzgwLDYgQEAgZW51bSB7DQo+ICAJT3B0X2N0bywgT3B0X25v
Y3RvLA0KPiAgCU9wdF9hYywgT3B0X25vYWMsDQo+ICAJT3B0X2xvY2ssIE9wdF9ub2xvY2ssDQo+
IC0JT3B0X3YyLCBPcHRfdjMsIE9wdF92NCwgT3B0X3Y0XzAsIE9wdF92NF8xLA0KPiAgCU9wdF91
ZHAsIE9wdF90Y3AsIE9wdF9yZG1hLA0KPiAgCU9wdF9hY2wsIE9wdF9ub2FjbCwNCj4gIAlPcHRf
cmRpcnBsdXMsIE9wdF9ub3JkaXJwbHVzLA0KPiBAQCAtMTMzLDExICsxMzIsNiBAQCBzdGF0aWMg
Y29uc3QgbWF0Y2hfdGFibGVfdCBuZnNfbW91bnRfb3B0aW9uX3Rva2VucyA9IHsNCj4gIAl7IE9w
dF9ub2FjLCAibm9hYyIgfSwNCj4gIAl7IE9wdF9sb2NrLCAibG9jayIgfSwNCj4gIAl7IE9wdF9u
b2xvY2ssICJub2xvY2siIH0sDQo+IC0JeyBPcHRfdjIsICJ2MiIgfSwNCj4gLQl7IE9wdF92Mywg
InYzIiB9LA0KPiAtCXsgT3B0X3Y0LCAidjQiIH0sDQo+IC0JeyBPcHRfdjRfMCwgInY0LjAiIH0s
DQo+IC0JeyBPcHRfdjRfMSwgInY0LjEiIH0sDQo+ICAJeyBPcHRfdWRwLCAidWRwIiB9LA0KPiAg
CXsgT3B0X3RjcCwgInRjcCIgfSwNCj4gIAl7IE9wdF9yZG1hLCAicmRtYSIgfSwNCj4gQEAgLTE4
Myw2ICsxNzcsOSBAQCBzdGF0aWMgY29uc3QgbWF0Y2hfdGFibGVfdCBuZnNfbW91bnRfb3B0aW9u
X3Rva2VucyA9IHsNCj4gIAl7IE9wdF9mc2NhY2hlX3VuaXEsICJmc2M9JXMiIH0sDQo+ICAJeyBP
cHRfbG9jYWxfbG9jaywgImxvY2FsX2xvY2s9JXMiIH0sDQo+ICANCj4gKwkvKiBUaGUgZm9sbG93
aW5nIG5lZWRzIHRvIGJlIGxpc3RlZCBhZnRlciBhbGwgb3RoZXIgb3B0aW9ucyAqLw0KPiArCXsg
T3B0X25mc3ZlcnMsICJ2JXMiIH0sDQo+ICsNCj4gIAl7IE9wdF9lcnIsIE5VTEwgfQ0KPiAgfTsN
Cj4gIA0KPiBAQCAtMTIyOCwyOCArMTIyNSw2IEBAIHN0YXRpYyBpbnQgbmZzX3BhcnNlX21vdW50
X29wdGlvbnMoY2hhciAqcmF3LA0KPiAgCQkJbW50LT5mbGFncyB8PSAoTkZTX01PVU5UX0xPQ0FM
X0ZMT0NLIHwNCj4gIAkJCQkgICAgICAgTkZTX01PVU5UX0xPQ0FMX0ZDTlRMKTsNCj4gIAkJCWJy
ZWFrOw0KPiAtCQljYXNlIE9wdF92MjoNCj4gLQkJCW1udC0+ZmxhZ3MgJj0gfk5GU19NT1VOVF9W
RVIzOw0KPiAtCQkJbW50LT52ZXJzaW9uID0gMjsNCj4gLQkJCWJyZWFrOw0KPiAtCQljYXNlIE9w
dF92MzoNCj4gLQkJCW1udC0+ZmxhZ3MgfD0gTkZTX01PVU5UX1ZFUjM7DQo+IC0JCQltbnQtPnZl
cnNpb24gPSAzOw0KPiAtCQkJYnJlYWs7DQo+IC0JCWNhc2UgT3B0X3Y0Og0KPiAtCQkJbW50LT5m
bGFncyAmPSB+TkZTX01PVU5UX1ZFUjM7DQo+IC0JCQltbnQtPnZlcnNpb24gPSA0Ow0KPiAtCQkJ
YnJlYWs7DQo+IC0JCWNhc2UgT3B0X3Y0XzA6DQo+IC0JCQltbnQtPmZsYWdzICY9IH5ORlNfTU9V
TlRfVkVSMzsNCj4gLQkJCW1udC0+dmVyc2lvbiA9IDQ7DQo+IC0JCQltbnQtPm1pbm9ydmVyc2lv
biA9IDA7DQo+IC0JCQlicmVhazsNCj4gLQkJY2FzZSBPcHRfdjRfMToNCj4gLQkJCW1udC0+Zmxh
Z3MgJj0gfk5GU19NT1VOVF9WRVIzOw0KPiAtCQkJbW50LT52ZXJzaW9uID0gNDsNCj4gLQkJCW1u
dC0+bWlub3J2ZXJzaW9uID0gMTsNCj4gLQkJCWJyZWFrOw0KPiAgCQljYXNlIE9wdF91ZHA6DQo+
ICAJCQltbnQtPmZsYWdzICY9IH5ORlNfTU9VTlRfVENQOw0KPiAgCQkJbW50LT5uZnNfc2VydmVy
LnByb3RvY29sID0gWFBSVF9UUkFOU1BPUlRfVURQOw0KDQotLSANClRyb25kIE15a2xlYnVzdA0K
TGludXggTkZTIGNsaWVudCBtYWludGFpbmVyDQoNCk5ldEFwcA0KVHJvbmQuTXlrbGVidXN0QG5l
dGFwcC5jb20NCnd3dy5uZXRhcHAuY29tDQoNCg==

Re: [PATCH 3/3] NFS: Consolidate the parsing of the '-ov4.x' and '-overs=4.x' mount options

[Steve Dickson]

On 03/02/2012 02:17 PM, Myklebust, Trond wrote:
> Steve,
> 
> When testing this patch, I noticed that the 'mount' program seems to be
> adding a 'vers=4' to my mount options.
> 
> IOW: when I tested the following mount command:
> 
>         mount -t nfs -ov4.1 foo:/bar /mnt
> 
> the kernel ended up parsing
> 
>    'v4.1,vers=4,addr=xxx.xxx.xxx.xxx, clientaddr=yyy.yyy.yyy.yyy'
> 
> which caused a bug in my original patches (where I had 'vers=4'
> automatically set minorversion=0).
> 
> Any idea why we're adding that extra vers=4?
Clearly... just to annoy you! 8-) it is Friday!! ;-)

Well when a (known) version is not specified, the
"vers=4" string is appended on the options line. I'm thinking
the reason as twofold. One so its clean communicate to the kernel 
this is a v4 mount and two, so "vers=4" shows up in /proc/mounts.

steved.

> 
> Cheers
>   Trond
> 
> On Fri, 2012-03-02 at 14:07 -0500, Trond Myklebust wrote:
>> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>> ---
>>  fs/nfs/super.c |   31 +++----------------------------
>>  1 files changed, 3 insertions(+), 28 deletions(-)
>>
>> diff --git a/fs/nfs/super.c b/fs/nfs/super.c
>> index 7f0c93f..f4ccdae 100644
>> --- a/fs/nfs/super.c
>> +++ b/fs/nfs/super.c
>> @@ -80,7 +80,6 @@ enum {
>>  	Opt_cto, Opt_nocto,
>>  	Opt_ac, Opt_noac,
>>  	Opt_lock, Opt_nolock,
>> -	Opt_v2, Opt_v3, Opt_v4, Opt_v4_0, Opt_v4_1,
>>  	Opt_udp, Opt_tcp, Opt_rdma,
>>  	Opt_acl, Opt_noacl,
>>  	Opt_rdirplus, Opt_nordirplus,
>> @@ -133,11 +132,6 @@ static const match_table_t nfs_mount_option_tokens = {
>>  	{ Opt_noac, "noac" },
>>  	{ Opt_lock, "lock" },
>>  	{ Opt_nolock, "nolock" },
>> -	{ Opt_v2, "v2" },
>> -	{ Opt_v3, "v3" },
>> -	{ Opt_v4, "v4" },
>> -	{ Opt_v4_0, "v4.0" },
>> -	{ Opt_v4_1, "v4.1" },
>>  	{ Opt_udp, "udp" },
>>  	{ Opt_tcp, "tcp" },
>>  	{ Opt_rdma, "rdma" },
>> @@ -183,6 +177,9 @@ static const match_table_t nfs_mount_option_tokens = {
>>  	{ Opt_fscache_uniq, "fsc=%s" },
>>  	{ Opt_local_lock, "local_lock=%s" },
>>  
>> +	/* The following needs to be listed after all other options */
>> +	{ Opt_nfsvers, "v%s" },
>> +
>>  	{ Opt_err, NULL }
>>  };
>>  
>> @@ -1228,28 +1225,6 @@ static int nfs_parse_mount_options(char *raw,
>>  			mnt->flags |= (NFS_MOUNT_LOCAL_FLOCK |
>>  				       NFS_MOUNT_LOCAL_FCNTL);
>>  			break;
>> -		case Opt_v2:
>> -			mnt->flags &= ~NFS_MOUNT_VER3;
>> -			mnt->version = 2;
>> -			break;
>> -		case Opt_v3:
>> -			mnt->flags |= NFS_MOUNT_VER3;
>> -			mnt->version = 3;
>> -			break;
>> -		case Opt_v4:
>> -			mnt->flags &= ~NFS_MOUNT_VER3;
>> -			mnt->version = 4;
>> -			break;
>> -		case Opt_v4_0:
>> -			mnt->flags &= ~NFS_MOUNT_VER3;
>> -			mnt->version = 4;
>> -			mnt->minorversion = 0;
>> -			break;
>> -		case Opt_v4_1:
>> -			mnt->flags &= ~NFS_MOUNT_VER3;
>> -			mnt->version = 4;
>> -			mnt->minorversion = 1;
>> -			break;
>>  		case Opt_udp:
>>  			mnt->flags &= ~NFS_MOUNT_TCP;
>>  			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
>