kevin/linux
1
Fork 0
Code
972d1a7b14
linux/net/sunrpc
History
Linus Torvalds 9f261e0113 Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 
* git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)
  NFS: unmark NFS direct I/O as experimental
  NFS: add comments clarifying the use of nfs_post_op_update()
  NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers
  NFS: Use SEEK_END instead of hardcoded value
  NFSv4: When mounting with a port=0 argument, substitute port=2049
  NFSv4: Poll more aggressively when handling NFS4ERR_DELAY
  NFSv4: Handle the condition NFS4ERR_FILE_OPEN
  NFSv4: Retry lease recovery if it failed during a synchronous operation.
  NFS: Don't invalidate the symlink we just stuffed into the cache
  NFS: Make read() return an ESTALE if the file has been deleted
  NFSv4: It's perfectly legal for clp to be NULL here....
  NFS: nfs_lookup - don't hash dentry when optimising away the lookup
  SUNRPC: Fix Oops in pmap_getport_done
  SUNRPC: Add refcounting to the struct rpc_xprt
  SUNRPC: Clean up soft task error handling
  SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors
  SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status
  Fix a referral error Oops
  NFS: NFS_ROOT should use the new rpc_create API
  NFS: Fix up compiler warnings on 64-bit platforms in client.c
  ...

Manually resolved conflict in net/sunrpc/xprtsock.c
2006-09-23 16:58:40 -07:00
..
auth_gss SUNRPC: Make rpc_mkpipe() take the parent dentry as an argument 2006-09-22 23:24:54 -04:00
auth_null.c NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts 2006-06-09 09:34:34 -04:00
auth_unix.c NFS: Display the chosen RPCSEC_GSS security flavour in /proc/mounts 2006-06-09 09:34:34 -04:00
auth.c SUNRPC: Auto-load RPC authentication kernel modules 2006-03-20 13:44:08 -05:00
cache.c [PATCH] knfsd: fix race related problem when adding items to and svcrpc auth cache 2006-08-06 08:57:47 -07:00
clnt.c SUNRPC: Add refcounting to the struct rpc_xprt 2006-09-22 23:25:01 -04:00
Makefile [PATCH] RPC: introduce client-side transport switch 2005-09-23 12:38:12 -04:00
pmap_clnt.c SUNRPC: Fix Oops in pmap_getport_done 2006-09-22 23:25:01 -04:00
rpc_pipe.c NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers 2006-09-22 23:25:05 -04:00
sched.c SUNRPC: rpc_delay() should not clobber the rpc_task->tk_status 2006-09-22 23:24:56 -04:00
socklib.c [NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE 2006-09-22 14:53:53 -07:00
stats.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
sunrpc_syms.c SUNRPC: Eliminate xprt_create_proto and rpc_create_client 2006-09-22 23:24:51 -04:00
svc.c [NET]: Conversions from kmalloc+memset to k(z|c)alloc. 2006-07-21 14:51:30 -07:00
svcauth_unix.c [PATCH] knfsd: Tidy up unix_domain_find 2006-03-27 08:44:43 -08:00
svcauth.c [PATCH] knfsd: Change the store of auth_domains to not be a 'cache' 2006-03-27 08:44:41 -08:00
svcsock.c [SUNRPC]: Update to use in-kernel sockets API. 2006-09-22 14:54:06 -07:00
sysctl.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
timer.c SUNRPC: remove extraneous header inclusions 2006-09-22 23:24:47 -04:00
xdr.c This fixes a panic doing the first READDIR or READDIRPLUS call when: 2006-07-05 13:17:12 -04:00
xprt.c SUNRPC: Add refcounting to the struct rpc_xprt 2006-09-22 23:25:01 -04:00
xprtsock.c Merge git://git.linux-nfs.org/pub/linux/nfs-2.6 2006-09-23 16:58:40 -07:00