• Linus Torvalds's avatar
    Merge tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · c224b76b
    Linus Torvalds authored
    Pull NFS client updates from Trond Myklebust:
     "Highlights include:
    
       - Changes to the RPC socket code to allow NFSv4 to turn off
         timeout+retry:
          * Detect TCP connection breakage through the "keepalive" mechanism
       - Add client side support for NFSv4.x migration (Chuck Lever)
       - Add support for multiple security flavour arguments to the "sec="
         mount option (Dros Adamson)
       - fs-cache bugfixes from David Howells:
         * Fix an issue whereby caching can be enabled on a file that is
           open for writing
       - More NFSv4 open code stable bugfixes
       - Various Labeled NFS (selinux) bugfixes, including one stable fix
       - Fix buffer overflow checking in the RPCSEC_GSS upcall encoding"
    
    * tag 'nfs-for-3.13-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (68 commits)
      NFSv4.2: Remove redundant checks in nfs_setsecurity+nfs4_label_init_security
      NFSv4: Sanity check the server reply in _nfs4_server_capabilities
      NFSv4.2: encode_readdir - only ask for labels when doing readdirplus
      nfs: set security label when revalidating inode
      NFSv4.2: Fix a mismatch between Linux labeled NFS and the NFSv4.2 spec
      NFS: Fix a missing initialisation when reading the SELinux label
      nfs: fix oops when trying to set SELinux label
      nfs: fix inverted test for delegation in nfs4_reclaim_open_state
      SUNRPC: Cleanup xs_destroy()
      SUNRPC: close a rare race in xs_tcp_setup_socket.
      SUNRPC: remove duplicated include from clnt.c
      nfs: use IS_ROOT not DCACHE_DISCONNECTED
      SUNRPC: Fix buffer overflow checking in gss_encode_v0_msg/gss_encode_v1_msg
      SUNRPC: gss_alloc_msg - choose _either_ a v0 message or a v1 message
      SUNRPC: remove an unnecessary if statement
      nfs: Use PTR_ERR_OR_ZERO in 'nfs/nfs4super.c'
      nfs: Use PTR_ERR_OR_ZERO in 'nfs41_callback_up' function
      nfs: Remove useless 'error' assignment
      sunrpc: comment typo fix
      SUNRPC: Add correct rcu_dereference annotation in rpc_clnt_set_transport
      ...
    c224b76b