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

1 files changed, 17 insertions, 24 deletions

diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c
index 3fc683f46b3e..5954dcb497e4 100644
--- a/fs/lockd/mon.c
+++ b/fs/lockd/mon.c
@@ -109,30 +109,23 @@ nsm_unmonitor(struct nlm_host *host)
 static struct rpc_clnt *
 nsm_create(void)
 {
-        struct rpc_xprt         *xprt;
-        struct rpc_clnt         *clnt;
-        struct sockaddr_in      sin;
-
-        sin.sin_family = AF_INET;
-        sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-        sin.sin_port = 0;
-
-        xprt = xprt_create_proto(IPPROTO_UDP, &sin, NULL);
-        if (IS_ERR(xprt))
-                return (struct rpc_clnt *)xprt;
-        xprt->resvport = 1;     /* NSM requires a reserved port */
-
-        clnt = rpc_create_client(xprt, "localhost",
-                                &nsm_program, SM_VERSION,
-                                RPC_AUTH_NULL);
-        if (IS_ERR(clnt))
-                goto out_err;
-        clnt->cl_softrtry = 1;
-        clnt->cl_oneshot  = 1;
-        return clnt;
-
-out_err:
-        return clnt;
+        struct sockaddr_in      sin = {
+                .sin_family     = AF_INET,
+                .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
+                .sin_port       = 0,
+        };
+        struct rpc_create_args args = {
+                .protocol       = IPPROTO_UDP,
+                .address        = (struct sockaddr *)&sin,
+                .addrsize       = sizeof(sin),
+                .servername     = "localhost",
+                .program        = &nsm_program,
+                .version        = SM_VERSION,
+                .authflavor     = RPC_AUTH_NULL,
+                .flags          = (RPC_CLNT_CREATE_ONESHOT),
+        };
+
+        return rpc_create(&args);
 }
 
 /*