• Linus Torvalds's avatar
    Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux · 5b174fd6
    Linus Torvalds authored
    Pull nfsd updates from Bruce Fields:
     "The largest piece is a long-overdue rewrite of the xdr code to remove
      some annoying limitations: for example, there was no way to return
      ACLs larger than 4K, and readdir results were returned only in 4k
      chunks, limiting performance on large directories.
    
      Also:
            - part of Neil Brown's work to make NFS work reliably over the
              loopback interface (so client and server can run on the same
              machine without deadlocks).  The rest of it is coming through
              other trees.
            - cleanup and bugfixes for some of the server RDMA code, from
              Steve Wise.
            - Various cleanup of NFSv4 state code in preparation for an
              overhaul of the locking, from Jeff, Trond, and Benny.
            - smaller bugfixes and cleanup from Christoph Hellwig and
              Kinglong Mee.
    
      Thanks to everyone!
    
      This summer looks likely to be busier than usual for knfsd.  Hopefully
      we won't break it too badly; testing definitely welcomed"
    
    * 'for-3.16' of git://linux-nfs.org/~bfields/linux: (100 commits)
      nfsd4: fix FREE_STATEID lockowner leak
      svcrdma: Fence LOCAL_INV work requests
      svcrdma: refactor marshalling logic
      nfsd: don't halt scanning the DRC LRU list when there's an RC_INPROG entry
      nfs4: remove unused CHANGE_SECURITY_LABEL
      nfsd4: kill READ64
      nfsd4: kill READ32
      nfsd4: simplify server xdr->next_page use
      nfsd4: hash deleg stateid only on successful nfs4_set_delegation
      nfsd4: rename recall_lock to state_lock
      nfsd: remove unneeded zeroing of fields in nfsd4_proc_compound
      nfsd: fix setting of NFS4_OO_CONFIRMED in nfsd4_open
      nfsd4: use recall_lock for delegation hashing
      nfsd: fix laundromat next-run-time calculation
      nfsd: make nfsd4_encode_fattr static
      SUNRPC/NFSD: Remove using of dprintk with KERN_WARNING
      nfsd: remove unused function nfsd_read_file
      nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer
      NFSD: Error out when getting more than one fsloc/secinfo/uuid
      NFSD: Using type of uint32_t for ex_nflavors instead of int
      ...
    5b174fd6
svc.c 15.6 KB