From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Mar 2013 21:23:45 +0000 (-0700)
Subject: Merge tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: firefly_0821_release~3680^2~840
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d538483ea4920899233d51f3e9c48c75cc10b6d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client bugfixes from Trond Myklebust:
 - Fix an NFSv4 idmapper regression
 - Fix an Oops in the pNFS blocks client
 - Fix up various issues with pNFS layoutcommit
 - Ensure correct read ordering of variables in
   rpc_wake_up_task_queue_locked

* tag 'nfs-for-3.9-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: Add barriers to ensure read ordering in rpc_wake_up_task_queue_locked
  NFSv4.1: Add a helper pnfs_commit_and_return_layout
  NFSv4.1: Always clear the NFS_INO_LAYOUTCOMMIT in layoutreturn
  NFSv4.1: Fix a race in pNFS layoutcommit
  pnfs-block: removing DM device maybe cause oops when call dev_remove
  NFSv4: Fix the string length returned by the idmapper
---

5d538483ea4920899233d51f3e9c48c75cc10b6d