Skip to content
  • Linus Torvalds's avatar
    Merge tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux · 5b1e167d
    Linus Torvalds authored
    Pull nfsd updates from Bruce Fields:
     "Various bugfixes, a RDMA update from Chuck Lever, and support for a
      new pnfs layout type from Christoph Hellwig.  The new layout type is a
      variant of the block layout which uses SCSI features to offer improved
      fencing and device identification.
    
      (Also: note this pull request also includes the client side of SCSI
      layout, with Trond's permission.)"
    
    * tag 'nfsd-4.6' of git://linux-nfs.org/~bfields/linux:
      sunrpc/cache: drop reference when sunrpc_cache_pipe_upcall() detects a race
      nfsd: recover: fix memory leak
      nfsd: fix deadlock secinfo+readdir compound
      nfsd4: resfh unused in nfsd4_secinfo
      svcrdma: Use new CQ API for RPC-over-RDMA server send CQs
      svcrdma: Use new CQ API for RPC-over-RDMA server receive CQs
      svcrdma: Remove close_out exit path
      svcrdma: Hook up the logic to return ERR_CHUNK
      svcrdma: Use correct XID in error replies
      svcrdma: Make RDMA_ERROR messages work
      rpcrdma: Add RPCRDMA_HDRLEN_ERR
      svcrdma: svc_rdma_post_recv() should close connection on error
      svcrdma: Close connection when a send error occurs
      nfsd: Lower NFSv4.1 callback message size limit
      svcrdma: Do not send Write chunk XDR pad with inline content
      svcrdma: Do not write xdr_buf::tail in a Write chunk
      svcrdma: Find client-provided write and reply chunks once per reply
      nfsd: Update NFS server comments related to RDMA support
      nfsd: Fix a memory leak when meeting unsupported state_protect_how4
      nfsd4: fix bad bounds checking
    5b1e167d