From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 23:26:22 +0000 (+1100)
Subject: Merge remote-tracking branch 'nfs/linux-next'
X-Git-Tag: next-20121008~65
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99ff2e20d6ad35ab5e5983dec86c6ef9c90d696f;p=karo-tx-linux.git

Merge remote-tracking branch 'nfs/linux-next'
---

99ff2e20d6ad35ab5e5983dec86c6ef9c90d696f
diff --cc fs/nfs/super.c
index d2c7f5db0847,b4079bbd30dd..e831bce49766
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@@ -1535,9 -1547,13 +1547,13 @@@ static int nfs_parse_mount_options(cha
  	if (mnt->minorversion && mnt->version != 4)
  		goto out_minorversion_mismatch;
  
+ 	if (mnt->options & NFS_OPTION_MIGRATION &&
+ 	    mnt->version != 4 && mnt->minorversion != 0)
+ 		goto out_migration_misuse;
+ 
  	/*
  	 * verify that any proto=/mountproto= options match the address
 -	 * familiies in the addr=/mountaddr= options.
 +	 * families in the addr=/mountaddr= options.
  	 */
  	if (protofamily != AF_UNSPEC &&
  	    protofamily != mnt->nfs_server.address.ss_family)