X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fnfs%2Fsuper.c;h=9abcd2b329f7357b0af65065613e996b643e1747;hb=4b8561521dbaa3d766b198496b220e984e3bf756;hp=1b94e3650f5cb343d241d372d0d03d85ed42528d;hpb=fa6dc9dc59c3a76fd209a97c8cf37395980fb903;p=linux-2.6

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 1b94e3650f..9abcd2b329 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1718,9 +1718,9 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
 	 * ones were explicitly specified. Fall back to legacy behavior and
 	 * just return success.
 	 */
-	if ((nfsvers == 4 && options4->version == 1) ||
-	    (nfsvers <= 3 && options->version >= 1 &&
-	     options->version <= 6))
+	if ((nfsvers == 4 && (!options4 || options4->version == 1)) ||
+	    (nfsvers <= 3 && (!options || (options->version >= 1 &&
+					   options->version <= 6))))
 		return 0;
 
 	data = kzalloc(sizeof(*data), GFP_KERNEL);