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

Pull NFS client updates for Linux 3.4 from Trond Myklebust:
 "New features include:
   - Add NFS client support for containers.

     This should enable most of the necessary functionality, including
     lockd support, and support for rpc.statd, NFSv4 idmapper and
     RPCSEC_GSS upcalls into the correct network namespace from which
     the mount system call was issued.

   - NFSv4 idmapper scalability improvements

     Base the idmapper cache on the keyring interface to allow
     concurrent access to idmapper entries.  Start the process of
     migrating users from the single-threaded daemon-based approach to
     the multi-threaded request-key based approach.

   - NFSv4.1 implementation id.

     Allows the NFSv4.1 client and server to mutually identify each
     other for logging and debugging purposes.

   - Support the 'vers=4.1' mount option for mounting NFSv4.1 instead of
     having to use the more counterintuitive 'vers=4,minorversion=1'.

   - SUNRPC tracepoints.

     Start the process of adding tracepoints in order to improve
     debugging of the RPC layer.

   - pNFS object layout support for autologin.

  Important bugfixes include:

   - Fix a bug in rpc_wake_up/rpc_wake_up_status that caused them to
     fail to wake up all tasks when applied to priority waitqueues.

   - Ensure that we handle read delegations correctly, when we try to
     truncate a file.

   - A number of fixes for NFSv4 state manager loops (mostly to do with
     delegation recovery)."

* tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (224 commits)
  NFS: fix sb->s_id in nfs debug prints
  xprtrdma: Remove assumption that each segment is <= PAGE_SIZE
  xprtrdma: The transport should not bug-check when a dup reply is received
  pnfs-obj: autologin: Add support for protocol autologin
  NFS: Remove nfs4_setup_sequence from generic rename code
  NFS: Remove nfs4_setup_sequence from generic unlink code
  NFS: Remove nfs4_setup_sequence from generic read code
  NFS: Remove nfs4_setup_sequence from generic write code
  NFS: Fix more NFS debug related build warnings
  SUNRPC/LOCKD: Fix build warnings when CONFIG_SUNRPC_DEBUG is undefined
  nfs: non void functions must return a value
  SUNRPC: Kill compiler warning when RPC_DEBUG is unset
  SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG
  NFS: Use cond_resched_lock() to reduce latencies in the commit scans
  NFSv4: It is not safe to dereference lsp->ls_state in release_lockowner
  NFS: ncommit count is being double decremented
  SUNRPC: We must not use list_for_each_entry_safe() in rpc_wake_up()
  Try using machine credentials for RENEW calls
  NFSv4.1: Fix a few issues in filelayout_commit_pagelist
  NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc fs/nfs/client.c
Simple merge

diff --cc fs/nfs/dir.c
Simple merge

diff --cc fs/nfs/idmap.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/linux/key.h
Simple merge

diff --cc net/sunrpc/rpc_pipe.c
index 7d6dd6e,8584ec0..c84c0e0
--- 1/net/sunrpc/rpc_pipe.c
--- 2/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@@ -1033,12 -1114,32 +1114,28 @@@ rpc_fill_super(struct super_block *sb, 
        sb->s_time_gran = 1;
  
        inode = rpc_get_inode(sb, S_IFDIR | 0755);
 -      if (!inode)
 -              return -ENOMEM;
 -      sb->s_root = root = d_alloc_root(inode);
 -      if (!root) {
 -              iput(inode);
 +      sb->s_root = root = d_make_root(inode);
 +      if (!root)
                return -ENOMEM;
 -      }
        if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL))
                return -ENOMEM;
+       dprintk("RPC:   sending pipefs MOUNT notification for net %p%s\n", net,
+                                                               NET_NAME(net));
+       err = blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+                                          RPC_PIPEFS_MOUNT,
+                                          sb);
+       if (err)
+               goto err_depopulate;
+       sb->s_fs_info = get_net(net);
+       sn->pipefs_sb = sb;
        return 0;
+ 
+ err_depopulate:
+       blocking_notifier_call_chain(&rpc_pipefs_notifier_list,
+                                          RPC_PIPEFS_UMOUNT,
+                                          sb);
+       __rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF);
+       return err;
  }
  
  static struct dentry *

diff --cc net/sunrpc/xprtrdma/rpc_rdma.c
Simple merge

diff --cc security/keys/keyctl.c
Simple merge