Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux · 61845143
    Linus Torvalds authored
    Pull nfsd updates from Bruce Fields:
     "The main change is the pNFS block server support from Christoph, which
      allows an NFS client connected to shared disk to do block IO to the
      shared disk in place of NFS reads and writes.  This also requires xfs
      patches, which should arrive soon through the xfs tree, barring
      unexpected problems.  Support for other filesystems is also possible
      if there's interest.
    
      Thanks also to Chuck Lever for continuing work to get NFS/RDMA into
      shape"
    
    * 'for-3.20' of git://linux-nfs.org/~bfields/linux: (32 commits)
      nfsd: default NFSv4.2 to on
      nfsd: pNFS block layout driver
      exportfs: add methods for block layout exports
      nfsd: add trace events
      nfsd: update documentation for pNFS support
      nfsd: implement pNFS layout recalls
      nfsd: implement pNFS operations
      nfsd: make find_any_file available outside nfs4state.c
      nfsd: make find/get/put file available outside nfs4state.c
      nfsd: make lookup/alloc/unhash_stid available outside nfs4state.c
      nfsd: add fh_fsid_match helper
      nfsd: move nfsd_fh_match to nfsfh.h
      fs: add FL_LAYOUT lease type
      fs: track fl_owner for leases
      nfs: add LAYOUT_TYPE_MAX enum value
      nfsd: factor out a helper to decode nfstime4 values
      sunrpc/lockd: fix references to the BKL
      nfsd: fix year-2038 nfs4 state problem
      svcrdma: Handle additional inline content
      svcrdma: Move read list XDR round-up logic
      ...
    61845143