Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux · 6dea0737
    Linus Torvalds authored
    Pull nfsd updates from Bruce Fields:
     "Highlights:
    
       - support the NFSv4.2 SEEK operation (allowing clients to support
         SEEK_HOLE/SEEK_DATA), thanks to Anna.
       - end the grace period early in a number of cases, mitigating a
         long-standing annoyance, thanks to Jeff
       - improve SMP scalability, thanks to Trond"
    
    * 'for-3.18' of git://linux-nfs.org/~bfields/linux: (55 commits)
      nfsd: eliminate "to_delegation" define
      NFSD: Implement SEEK
      NFSD: Add generic v4.2 infrastructure
      svcrdma: advertise the correct max payload
      nfsd: introduce nfsd4_callback_ops
      nfsd: split nfsd4_callback initialization and use
      nfsd: introduce a generic nfsd4_cb
      nfsd: remove nfsd4_callback.cb_op
      nfsd: do not clear rpc_resp in nfsd4_cb_done_sequence
      nfsd: fix nfsd4_cb_recall_done error handling
      nfsd4: clarify how grace period ends
      nfsd4: stop grace_time update at end of grace period
      nfsd: skip subsequent UMH "create" operations after the first one for v4.0 clients
      nfsd: set and test NFSD4_CLIENT_STABLE bit to reduce nfsdcltrack upcalls
      nfsd: serialize nfsdcltrack upcalls for a particular client
      nfsd: pass extra info in env vars to upcalls to allow for early grace period end
      nfsd: add a v4_end_grace file to /proc/fs/nfsd
      lockd: add a /proc/fs/lockd/nlm_end_grace file
      nfsd: reject reclaim request when client has already sent RECLAIM_COMPLETE
      nfsd: remove redundant boot_time parm from grace_done client tracking op
      ...
    6dea0737