Skip to content
  • Linus Torvalds's avatar
    Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 01cde153
    Linus Torvalds authored
    Pull NFS client updates from Trond Myklebust:
     "Highlights include:
    
      Features:
       - Add support for multiple NFSv4.1 callbacks in flight
       - Initial patchset for RPC multipath support
       - Adapt RPC/RDMA to use the new completion queue API
    
      Bugfixes and cleanups:
       - nfs4: nfs4_ff_layout_prepare_ds should return NULL if connection failed
       - Cleanups to remove nfs_inode_dio_wait and nfs4_file_fsync
       - Fix RPC/RDMA credit accounting
       - Properly handle RDMA_ERROR replies
       - xprtrdma: Do not wait if ib_post_send() fails
       - xprtrdma: Segment head and tail XDR buffers on page boundaries
       - xprtrdma cleanups for dprintk, physical_op_map and unused macros"
    
    * tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (35 commits)
      nfs/blocklayout: make sure making a aligned read request
      nfs4: nfs4_ff_layout_prepare_ds should return NULL if connection failed
      nfs: remove nfs_inode_dio_wait
      nfs: remove nfs4_file_fsync
      xprtrdma: Use new CQ API for RPC-over-RDMA client send CQs
      xprtrdma: Use an anonymous union in struct rpcrdma_mw
      xprtrdma: Use new CQ API for RPC-over-RDMA client receive CQs
      xprtrdma: Serialize credit accounting again
      xprtrdma: Properly handle RDMA_ERROR replies
      rpcrdma: Add RPCRDMA_HDRLEN_ERR
      xprtrdma: Do not wait if ib_post_send() fails
      xprtrdma: Segment head and tail XDR buffers on page boundaries
      xprtrdma: Clean up dprintk format string containing a newline
      xprtrdma: Clean up physical_op_map()
      xprtrdma: Clean up unused RPCRDMA_INLINE_PAD_THRESH macro
      NFS add callback_ops to nfs4_proc_bind_conn_to_session_callback
      pnfs/NFSv4.1: Add multipath capabilities to pNFS flexfiles servers over NFSv3
      SUNRPC: Allow addition of new transports to a struct rpc_clnt
      NFSv4.1: nfs4_proc_bind_conn_to_session must iterate over all connections
      SUNRPC: Make NFS swap work with multipath
      ...
    01cde153