2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
linux-next/include/linux/sunrpc
Linus Torvalds 18bce371ae Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits)
  nfsd4: fix callback restarting
  nfsd: break lease on unlink, link, and rename
  nfsd4: break lease on nfsd setattr
  nfsd: don't support msnfs export option
  nfsd4: initialize cb_per_client
  nfsd4: allow restarting callbacks
  nfsd4: simplify nfsd4_cb_prepare
  nfsd4: give out delegations more quickly in 4.1 case
  nfsd4: add helper function to run callbacks
  nfsd4: make sure sequence flags are set after destroy_session
  nfsd4: re-probe callback on connection loss
  nfsd4: set sequence flag when backchannel is down
  nfsd4: keep finer-grained callback status
  rpc: allow xprt_class->setup to return a preexisting xprt
  rpc: keep backchannel xprt as long as server connection
  rpc: move sk_bc_xprt to svc_xprt
  nfsd4: allow backchannel recovery
  nfsd4: support BIND_CONN_TO_SESSION
  nfsd4: modify session list under cl_lock
  Documentation: fl_mylease no longer exists
  ...

Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work.  The
vfs-scale work touched some msnfs cases, and this merge removes support
for that entirely, so the conflict was trivial to resolve.
2011-01-14 13:17:26 -08:00
..
auth_gss.h nfs: __rcu annotations 2010-08-19 17:18:00 -07:00
auth.h SUNRPC: New xdr_streams XDR decoder API 2010-12-16 12:37:25 -05:00
bc_xprt.h NFS rename client back channel transport field 2011-01-06 14:46:25 -05:00
cache.h Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux 2011-01-14 13:17:26 -08:00
clnt.h SUNRPC: New xdr_streams XDR decoder API 2010-12-16 12:37:25 -05:00
debug.h
gss_api.h NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls 2010-05-14 15:09:33 -04:00
gss_asn1.h
gss_err.h
gss_krb5.h NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls 2010-05-14 15:09:33 -04:00
Kbuild include: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
metrics.h SUNRPC: Replace jiffies-based metrics with ktime-based metrics 2010-05-14 15:09:33 -04:00
msg_prot.h
rpc_pipe_fs.h
rpc_rdma.h
sched.h SUNRPC: Ensure that rpc_exit() always wakes up a sleeping task 2010-08-04 08:54:07 -04:00
stats.h sunrpc: Make the /proc/net/rpc appear in net namespaces 2010-09-27 10:16:12 -04:00
svc_rdma.h
svc_xprt.h Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux 2011-01-14 13:17:26 -08:00
svc.h Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux 2011-01-14 13:17:26 -08:00
svcauth_gss.h
svcauth.h sunrpc: Add net to pure API calls 2010-09-27 10:16:11 -04:00
svcsock.h rpc: move sk_bc_xprt to svc_xprt 2011-01-11 15:04:10 -05:00
timer.h
types.h
xdr.h Merge branch 'bugfixes' into nfs-for-2.6.38 2011-01-10 14:48:02 -05:00
xprt.h rpc: allow xprt_class->setup to return a preexisting xprt 2011-01-11 15:04:10 -05:00
xprtrdma.h
xprtsock.h