From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 23 Sep 2006 23:58:40 +0000 (-0700)
Subject: Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
X-Git-Tag: v2.6.19-rc1~1271
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9f261e011340bcd22c1dd48b465153bd78caa8c8;p=linux-2.6-block.git

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
---

9f261e011340bcd22c1dd48b465153bd78caa8c8
diff --cc net/sunrpc/xprtsock.c
index 897bdd982315,0b84fab68d7e..9b62923a9c06
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@@ -1146,8 -1211,8 +1206,8 @@@ static void xs_tcp_connect_worker(void 
  	/* Tell the socket layer to start connecting... */
  	xprt->stat.connect_count++;
  	xprt->stat.connect_start = jiffies;
 -	status = sock->ops->connect(sock, (struct sockaddr *) &xprt->addr,
 +	status = kernel_connect(sock, (struct sockaddr *) &xprt->addr,
- 			sizeof(xprt->addr), O_NONBLOCK);
+ 			xprt->addrlen, O_NONBLOCK);
  	dprintk("RPC: %p  connect status %d connected %d sock state %d\n",
  			xprt, -status, xprt_connected(xprt), sock->sk->sk_state);
  	if (status < 0) {