--- fs/nfs/inode.c.orig	2005-03-15 16:12:07.000000000 +0000
+++ fs/nfs/inode.c	2005-03-16 13:42:13.000000000 +0000
@@ -1385,9 +1385,19 @@ static struct super_block *nfs_get_sb(st
 	/* Zero out the NFS state stuff */
 	init_nfsv4_state(server);
 
+	/* NFS v2 and v3 are interoperable and will continue to be so..
+	 * This should be reviewed when NFS_MOUNT_VERSION increments */
+	if ((data->version <2 ||
+	     data->version >6 ||
+	     NFS_MOUNT_VERSION < 2 ||
+	     NFS_MOUNT_VERSION > 6)
+	    && data->version != NFS_MOUNT_VERSION) {
+		printk("nfs warning: possibly dangerous mount version incompatibility: mount(v%d) %s than kernel(v%d)\n",
+		       data->version, data->version < NFS_MOUNT_VERSION ? "older" : "newer", NFS_MOUNT_VERSION);
+	}
+	
+	/* All <> values of NFS_MOUNT_VERSION 2..6 are handled */
 	if (data->version != NFS_MOUNT_VERSION) {
-		printk("nfs warning: mount version %s than kernel\n",
-			data->version < NFS_MOUNT_VERSION ? "older" : "newer");
 		if (data->version < 2)
 			data->namlen = 0;
 		if (data->version < 3)