From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Oct 2012 14:52:35 +0000 (+0900)
Subject: Merge tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: v3.7-rc1~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df632d3ce7eacf92ad9b642301c7b53a1d95b8d8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust:
 "Features include:

   - Remove CONFIG_EXPERIMENTAL dependency from NFSv4.1
     Aside from the issues discussed at the LKS, distros are shipping
     NFSv4.1 with all the trimmings.
   - Fix fdatasync()/fsync() for the corner case of a server reboot.
   - NFSv4 OPEN access fix: finally distinguish correctly between
     open-for-read and open-for-execute permissions in all situations.
   - Ensure that the TCP socket is closed when we're in CLOSE_WAIT
   - More idmapper bugfixes
   - Lots of pNFS bugfixes and cleanups to remove unnecessary state and
     make the code easier to read.
   - In cases where a pNFS read or write fails, allow the client to
     resume trying layoutgets after two minutes of read/write-
     through-mds.
   - More net namespace fixes to the NFSv4 callback code.
   - More net namespace fixes to the NFSv3 locking code.
   - More NFSv4 migration preparatory patches.
     Including patches to detect network trunking in both NFSv4 and
     NFSv4.1
   - pNFS block updates to optimise LAYOUTGET calls."

* tag 'nfs-for-3.7-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (113 commits)
  pnfsblock: cleanup nfs4_blkdev_get
  NFS41: send real read size in layoutget
  NFS41: send real write size in layoutget
  NFS: track direct IO left bytes
  NFSv4.1: Cleanup ugliness in pnfs_layoutgets_blocked()
  NFSv4.1: Ensure that the layout sequence id stays 'close' to the current
  NFSv4.1: Deal with seqid wraparound in the pNFS return-on-close code
  NFSv4 set open access operation call flag in nfs4_init_opendata_res
  NFSv4.1: Remove the dependency on CONFIG_EXPERIMENTAL
  NFSv4 reduce attribute requests for open reclaim
  NFSv4: nfs4_open_done first must check that GETATTR decoded a file type
  NFSv4.1: Deal with wraparound when updating the layout "barrier" seqid
  NFSv4.1: Deal with wraparound issues when updating the layout stateid
  NFSv4.1: Always set the layout stateid if this is the first layoutget
  NFSv4.1: Fix another refcount issue in pnfs_find_alloc_layout
  NFSv4: don't put ACCESS in OPEN compound if O_EXCL
  NFSv4: don't check MAY_WRITE access bit in OPEN
  NFS: Set key construction data for the legacy upcall
  NFSv4.1: don't do two EXCHANGE_IDs on mount
  NFS: nfs41_walk_client_list(): re-lock before iterating
  ...
---

df632d3ce7eacf92ad9b642301c7b53a1d95b8d8
diff --cc fs/nfs/super.c
index d2c7f5d,b4079bb..e831bce
--- 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)