1. 27 10月, 2010 2 次提交
    • L
      Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux · 4390110f
      Linus Torvalds 提交于
      * 'for-2.6.37' of git://linux-nfs.org/~bfields/linux: (99 commits)
        svcrpc: svc_tcp_sendto XPT_DEAD check is redundant
        svcrpc: no need for XPT_DEAD check in svc_xprt_enqueue
        svcrpc: assume svc_delete_xprt() called only once
        svcrpc: never clear XPT_BUSY on dead xprt
        nfsd4: fix connection allocation in sequence()
        nfsd4: only require krb5 principal for NFSv4.0 callbacks
        nfsd4: move minorversion to client
        nfsd4: delay session removal till free_client
        nfsd4: separate callback change and callback probe
        nfsd4: callback program number is per-session
        nfsd4: track backchannel connections
        nfsd4: confirm only on succesful create_session
        nfsd4: make backchannel sequence number per-session
        nfsd4: use client pointer to backchannel session
        nfsd4: move callback setup into session init code
        nfsd4: don't cache seq_misordered replies
        SUNRPC: Properly initialize sock_xprt.srcaddr in all cases
        SUNRPC: Use conventional switch statement when reclassifying sockets
        sunrpc/xprtrdma: clean up workqueue usage
        sunrpc: Turn list_for_each-s into the ..._entry-s
        ...
      
      Fix up trivial conflicts (two different deprecation notices added in
      separate branches) in Documentation/feature-removal-schedule.txt
      4390110f
    • L
      Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · a4dd8dce
      Linus Torvalds 提交于
      * 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        net/sunrpc: Use static const char arrays
        nfs4: fix channel attribute sanity-checks
        NFSv4.1: Use more sensible names for 'initialize_mountpoint'
        NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure
        NFSv4.1: pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure
        NFS: client needs to maintain list of inodes with active layouts
        NFS: create and destroy inode's layout cache
        NFSv4.1: pnfs: filelayout: introduce minimal file layout driver
        NFSv4.1: pnfs: full mount/umount infrastructure
        NFS: set layout driver
        NFS: ask for layouttypes during v4 fsinfo call
        NFS: change stateid to be a union
        NFSv4.1: pnfsd, pnfs: protocol level pnfs constants
        SUNRPC: define xdr_decode_opaque_fixed
        NFSD: remove duplicate NFS4_STATEID_SIZE
      a4dd8dce
  2. 26 10月, 2010 38 次提交