Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-3.7' of git://linux-nfs.org/~bfields/linux · bd81ccea
    Linus Torvalds authored
    Pull nfsd update from J Bruce Fields:
     "Another relatively quiet cycle.  There was some progress on my
      remaining 4.1 todo's, but a couple of them were just of the form
      "check that we do X correctly", so didn't have much affect on the
      code.
    
      Other than that, a bunch of cleanup and some bugfixes (including an
      annoying NFSv4.0 state leak and a busy-loop in the server that could
      cause it to peg the CPU without making progress)."
    
    * 'for-3.7' of git://linux-nfs.org/~bfields/linux: (46 commits)
      UAPI: (Scripted) Disintegrate include/linux/sunrpc
      UAPI: (Scripted) Disintegrate include/linux/nfsd
      nfsd4: don't allow reclaims of expired clients
      nfsd4: remove redundant callback probe
      nfsd4: expire old client earlier
      nfsd4: separate session allocation and initialization
      nfsd4: clean up session allocation
      nfsd4: minor free_session cleanup
      nfsd4: new_conn_from_crses should only allocate
      nfsd4: separate connection allocation and initialization
      nfsd4: reject bad forechannel attrs earlier
      nfsd4: enforce per-client sessions/no-sessions distinction
      nfsd4: set cl_minorversion at create time
      nfsd4: don't pin clientids to pseudoflavors
      nfsd4: fix bind_conn_to_session xdr comment
      nfsd4: cast readlink() bug argument
      NFSD: pass null terminated buf to kstrtouint()
      nfsd: remove duplicate init in nfsd4_cb_recall
      nfsd4: eliminate redundant nfs4_free_stateid
      fs/nfsd/nfs4idmap.c: adjust inconsistent IS_ERR and PTR_ERR
      ...
    bd81ccea