• Linus Torvalds's avatar
    Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux · 860448cf
    Linus Torvalds authored
    Pull nfsd updates from Bruce Fields:
     "A quiet cycle this time; this is basically entirely bugfixes.
    
      The few that aren't cc'd to stable are cleanup or seemed unlikely to
      affect anyone much"
    
    * 'for-4.1' of git://linux-nfs.org/~bfields/linux:
      uapi: Remove kernel internal declaration
      nfsd: fix nsfd startup race triggering BUG_ON
      nfsd: eliminate NFSD_DEBUG
      nfsd4: fix READ permission checking
      nfsd4: disallow SEEK with special stateids
      nfsd4: disallow ALLOCATE with special stateids
      nfsd: add NFSEXP_PNFS to the exflags array
      nfsd: Remove duplicate macro define for max sec label length
      nfsd: allow setting acls with unenforceable DENYs
      nfsd: NFSD_FAULT_INJECTION depends on DEBUG_FS
      nfsd: remove unused status arg to nfsd4_cleanup_open_state
      nfsd: remove bogus setting of status in nfsd4_process_open2
      NFSD: Use correct reply size calculating function
      NFSD: Using path_equal() for checking two paths
    860448cf
nfs4state.c 168 KB