• Linus Torvalds's avatar
    Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux · 8b306a2e
    Linus Torvalds authored
    Pull more nfsd updates from Bruce Fields:
     "Apologies for the previous request, which omitted the top 8 commits
      from my for-next branch (including the SCSI layout commits).  Thanks
      to Trond for spotting my error!"
    This actually includes the new layout types, so here's that part of
    the pull message repeated:
     "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.
      Note this pull request also includes the client side of SCSI layout,
      with Trond's permission"
    * tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux:
      nfsd: use short read as well as i_size to set eof
      nfsd: better layoutupdate bounds-checking
      nfsd: block and scsi layout drivers need to depend on CONFIG_BLOCK
      nfsd: add SCSI layout support
      nfsd: move some blocklayout code
      nfsd: add a new config option for the block layout driver
      nfs/blocklayout: add SCSI layout support
      nfs4.h: add SCSI layout definitions
xfs_export.c 6.62 KB