---

yaml --- r: 101932 b: refs/heads/master c: cd10072 h: refs/heads/master v: v3
git-mirror · Jul 9, 2008 · c4796e6 · c4796e6
1 parent f84c5fe
commit c4796e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e468bae97d243fe0e1515abaa1f7d0edf1476ad0
+refs/heads/master: cd100725620a8063fbc81bcf16d7c9e71a9583e0
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
@@ -1428,15 +1428,16 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
 	struct nfs_parsed_mount_data *data;
 	struct nfs_mount_data *options = (struct nfs_mount_data *)raw_data;
 	struct nfs4_mount_data *options4 = (struct nfs4_mount_data *)raw_data;
+	u32 nfsvers = nfss->nfs_client->rpc_ops->version;
 
 	/*
 	 * Userspace mount programs that send binary options generally send
 	 * them populated with default values. We have no way to know which
 	 * ones were explicitly specified. Fall back to legacy behavior and
 	 * just return success.
 	 */
-	if ((sb->s_type == &nfs4_fs_type && options4->version == 1) ||
-	    (sb->s_type == &nfs_fs_type && options->version >= 1 &&
+	if ((nfsvers == 4 && options4->version == 1) ||
+	    (nfsvers <= 3 && options->version >= 1 &&
 	     options->version <= 6))
 		return 0;