From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 10 Aug 2009 21:45:50 +0000 (-0400)
Subject: Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32
X-Git-Tag: v2.6.32-rc1~412^2~48^2~9
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=976a6f921cad26651d25e73826c05c7a023f5fa4;hp=-c;p=linux-block.git

Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32
---

976a6f921cad26651d25e73826c05c7a023f5fa4
diff --combined fs/nfs/internal.h
index e2ccb4a4398a,c2f171a3d70e..2e485677019c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@@ -102,6 -102,7 +102,7 @@@ struct nfs_mount_request 
  };
  
  extern int nfs_mount(struct nfs_mount_request *info);
+ extern void nfs_umount(const struct nfs_mount_request *info);
  
  /* client.c */
  extern struct rpc_program nfs_program;
@@@ -213,7 -214,6 +214,6 @@@ void nfs_zap_acl_cache(struct inode *in
  extern int nfs_wait_bit_killable(void *word);
  
  /* super.c */
- void nfs_parse_ip_address(char *, size_t, struct sockaddr *, size_t *);
  extern struct file_system_type nfs_xdev_fs_type;
  #ifdef CONFIG_NFS_V4
  extern struct file_system_type nfs4_xdev_fs_type;
@@@ -248,12 -248,6 +248,12 @@@ extern void nfs_read_prepare(struct rpc
  
  /* write.c */
  extern void nfs_write_prepare(struct rpc_task *task, void *calldata);
 +#ifdef CONFIG_MIGRATION
 +extern int nfs_migrate_page(struct address_space *,
 +		struct page *, struct page *);
 +#else
 +#define nfs_migrate_page NULL
 +#endif
  
  /* nfs4proc.c */
  extern int _nfs4_call_sync(struct nfs_server *server,
@@@ -374,24 -368,3 +374,3 @@@ unsigned int nfs_page_array_len(unsigne
  	return ((unsigned long)len + (unsigned long)base +
  		PAGE_SIZE - 1) >> PAGE_SHIFT;
  }
- 
- #define IPV6_SCOPE_DELIMITER	'%'
- 
- /*
-  * Set the port number in an address.  Be agnostic about the address
-  * family.
-  */
- static inline void nfs_set_port(struct sockaddr *sap, unsigned short port)
- {
- 	struct sockaddr_in *ap = (struct sockaddr_in *)sap;
- 	struct sockaddr_in6 *ap6 = (struct sockaddr_in6 *)sap;
- 
- 	switch (sap->sa_family) {
- 	case AF_INET:
- 		ap->sin_port = htons(port);
- 		break;
- 	case AF_INET6:
- 		ap6->sin6_port = htons(port);
- 		break;
- 	}
- }
diff --combined fs/nfs/mount_clnt.c
index 8b9affc8bab2,72dd8b6ccafa..0adefc40cc89
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
@@@ -209,6 -209,71 +209,71 @@@ out_mnt_err
  	goto out;
  }
  
+ /**
+  * nfs_umount - Notify a server that we have unmounted this export
+  * @info: pointer to umount request arguments
+  *
+  * MOUNTPROC_UMNT is advisory, so we set a short timeout, and always
+  * use UDP.
+  */
+ void nfs_umount(const struct nfs_mount_request *info)
+ {
+ 	static const struct rpc_timeout nfs_umnt_timeout = {
+ 		.to_initval = 1 * HZ,
+ 		.to_maxval = 3 * HZ,
+ 		.to_retries = 2,
+ 	};
+ 	struct rpc_create_args args = {
+ 		.protocol	= IPPROTO_UDP,
+ 		.address	= info->sap,
+ 		.addrsize	= info->salen,
+ 		.timeout	= &nfs_umnt_timeout,
+ 		.servername	= info->hostname,
+ 		.program	= &mnt_program,
+ 		.version	= info->version,
+ 		.authflavor	= RPC_AUTH_UNIX,
+ 		.flags		= RPC_CLNT_CREATE_NOPING,
+ 	};
+ 	struct mountres	result;
+ 	struct rpc_message msg	= {
+ 		.rpc_argp	= info->dirpath,
+ 		.rpc_resp	= &result,
+ 	};
+ 	struct rpc_clnt *clnt;
+ 	int status;
+ 
+ 	if (info->noresvport)
+ 		args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;
+ 
+ 	clnt = rpc_create(&args);
+ 	if (unlikely(IS_ERR(clnt)))
+ 		goto out_clnt_err;
+ 
+ 	dprintk("NFS: sending UMNT request for %s:%s\n",
+ 		(info->hostname ? info->hostname : "server"), info->dirpath);
+ 
+ 	if (info->version == NFS_MNT3_VERSION)
+ 		msg.rpc_proc = &clnt->cl_procinfo[MOUNTPROC3_UMNT];
+ 	else
+ 		msg.rpc_proc = &clnt->cl_procinfo[MOUNTPROC_UMNT];
+ 
+ 	status = rpc_call_sync(clnt, &msg, 0);
+ 	rpc_shutdown_client(clnt);
+ 
+ 	if (unlikely(status < 0))
+ 		goto out_call_err;
+ 
+ 	return;
+ 
+ out_clnt_err:
+ 	dprintk("NFS: failed to create UMNT RPC client, status=%ld\n",
+ 			PTR_ERR(clnt));
+ 	return;
+ 
+ out_call_err:
+ 	dprintk("NFS: UMNT request failed, status=%d\n", status);
+ }
+ 
  /*
   * XDR encode/decode functions for MOUNT
   */
@@@ -258,7 -323,7 +323,7 @@@ static int decode_status(struct xdr_str
  		return -EIO;
  	status = ntohl(*p);
  
 -	for (i = 0; i <= ARRAY_SIZE(mnt_errtbl); i++) {
 +	for (i = 0; i < ARRAY_SIZE(mnt_errtbl); i++) {
  		if (mnt_errtbl[i].status == status) {
  			res->errno = mnt_errtbl[i].errno;
  			return 0;
@@@ -309,7 -374,7 +374,7 @@@ static int decode_fhs_status(struct xdr
  		return -EIO;
  	status = ntohl(*p);
  
 -	for (i = 0; i <= ARRAY_SIZE(mnt3_errtbl); i++) {
 +	for (i = 0; i < ARRAY_SIZE(mnt3_errtbl); i++) {
  		if (mnt3_errtbl[i].status == status) {
  			res->errno = mnt3_errtbl[i].errno;
  			return 0;
@@@ -407,6 -472,13 +472,13 @@@ static struct rpc_procinfo mnt_procedur
  		.p_statidx	= MOUNTPROC_MNT,
  		.p_name		= "MOUNT",
  	},
+ 	[MOUNTPROC_UMNT] = {
+ 		.p_proc		= MOUNTPROC_UMNT,
+ 		.p_encode	= (kxdrproc_t)mnt_enc_dirpath,
+ 		.p_arglen	= MNT_enc_dirpath_sz,
+ 		.p_statidx	= MOUNTPROC_UMNT,
+ 		.p_name		= "UMOUNT",
+ 	},
  };
  
  static struct rpc_procinfo mnt3_procedures[] = {
@@@ -419,6 -491,13 +491,13 @@@
  		.p_statidx	= MOUNTPROC3_MNT,
  		.p_name		= "MOUNT",
  	},
+ 	[MOUNTPROC3_UMNT] = {
+ 		.p_proc		= MOUNTPROC3_UMNT,
+ 		.p_encode	= (kxdrproc_t)mnt_enc_dirpath,
+ 		.p_arglen	= MNT_enc_dirpath_sz,
+ 		.p_statidx	= MOUNTPROC3_UMNT,
+ 		.p_name		= "UMOUNT",
+ 	},
  };
  
  
diff --combined net/sunrpc/xprtsock.c
index 585a864c1c4c,8aaf9003fe6e..62438f3a914d
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@@ -248,8 -248,8 +248,8 @@@ struct sock_xprt 
  	 * Connection of transports
  	 */
  	struct delayed_work	connect_worker;
- 	struct sockaddr_storage	addr;
- 	unsigned short		port;
+ 	struct sockaddr_storage	srcaddr;
+ 	unsigned short		srcport;
  
  	/*
  	 * UDP socket buffer size parameters
@@@ -296,117 -296,60 +296,60 @@@ static inline struct sockaddr_in6 *xs_a
  	return (struct sockaddr_in6 *) &xprt->addr;
  }
  
- static void xs_format_ipv4_peer_addresses(struct rpc_xprt *xprt,
- 					  const char *protocol,
- 					  const char *netid)
+ static void xs_format_common_peer_addresses(struct rpc_xprt *xprt)
  {
- 	struct sockaddr_in *addr = xs_addr_in(xprt);
- 	char *buf;
+ 	struct sockaddr *sap = xs_addr(xprt);
+ 	struct sockaddr_in6 *sin6;
+ 	struct sockaddr_in *sin;
+ 	char buf[128];
  
- 	buf = kzalloc(20, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 20, "%pI4", &addr->sin_addr.s_addr);
- 	}
- 	xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
- 
- 	buf = kzalloc(8, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 8, "%u",
- 				ntohs(addr->sin_port));
- 	}
- 	xprt->address_strings[RPC_DISPLAY_PORT] = buf;
- 
- 	xprt->address_strings[RPC_DISPLAY_PROTO] = protocol;
- 
- 	buf = kzalloc(48, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 48, "addr=%pI4 port=%u proto=%s",
- 			&addr->sin_addr.s_addr,
- 			ntohs(addr->sin_port),
- 			protocol);
- 	}
- 	xprt->address_strings[RPC_DISPLAY_ALL] = buf;
- 
- 	buf = kzalloc(10, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 10, "%02x%02x%02x%02x",
- 				NIPQUAD(addr->sin_addr.s_addr));
- 	}
- 	xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;
+ 	(void)rpc_ntop(sap, buf, sizeof(buf));
+ 	xprt->address_strings[RPC_DISPLAY_ADDR] = kstrdup(buf, GFP_KERNEL);
  
- 	buf = kzalloc(8, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 8, "%4hx",
- 				ntohs(addr->sin_port));
- 	}
- 	xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
- 
- 	buf = kzalloc(30, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 30, "%pI4.%u.%u",
- 				&addr->sin_addr.s_addr,
- 				ntohs(addr->sin_port) >> 8,
- 				ntohs(addr->sin_port) & 0xff);
+ 	switch (sap->sa_family) {
+ 	case AF_INET:
+ 		sin = xs_addr_in(xprt);
+ 		(void)snprintf(buf, sizeof(buf), "%02x%02x%02x%02x",
+ 					NIPQUAD(sin->sin_addr.s_addr));
+ 		break;
+ 	case AF_INET6:
+ 		sin6 = xs_addr_in6(xprt);
+ 		(void)snprintf(buf, sizeof(buf), "%pi6", &sin6->sin6_addr);
+ 		break;
+ 	default:
+ 		BUG();
  	}
- 	xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
- 
- 	xprt->address_strings[RPC_DISPLAY_NETID] = netid;
+ 	xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = kstrdup(buf, GFP_KERNEL);
  }
  
- static void xs_format_ipv6_peer_addresses(struct rpc_xprt *xprt,
- 					  const char *protocol,
- 					  const char *netid)
+ static void xs_format_common_peer_ports(struct rpc_xprt *xprt)
  {
- 	struct sockaddr_in6 *addr = xs_addr_in6(xprt);
- 	char *buf;
+ 	struct sockaddr *sap = xs_addr(xprt);
+ 	char buf[128];
  
- 	buf = kzalloc(40, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 40, "%pI6",&addr->sin6_addr);
- 	}
- 	xprt->address_strings[RPC_DISPLAY_ADDR] = buf;
+ 	(void)snprintf(buf, sizeof(buf), "%u", rpc_get_port(sap));
+ 	xprt->address_strings[RPC_DISPLAY_PORT] = kstrdup(buf, GFP_KERNEL);
  
- 	buf = kzalloc(8, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 8, "%u",
- 				ntohs(addr->sin6_port));
- 	}
- 	xprt->address_strings[RPC_DISPLAY_PORT] = buf;
+ 	(void)snprintf(buf, sizeof(buf), "%4hx", rpc_get_port(sap));
+ 	xprt->address_strings[RPC_DISPLAY_HEX_PORT] = kstrdup(buf, GFP_KERNEL);
+ }
  
+ static void xs_format_peer_addresses(struct rpc_xprt *xprt,
+ 				     const char *protocol,
+ 				     const char *netid)
+ {
  	xprt->address_strings[RPC_DISPLAY_PROTO] = protocol;
+ 	xprt->address_strings[RPC_DISPLAY_NETID] = netid;
+ 	xs_format_common_peer_addresses(xprt);
+ 	xs_format_common_peer_ports(xprt);
+ }
  
- 	buf = kzalloc(64, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 64, "addr=%pI6 port=%u proto=%s",
- 				&addr->sin6_addr,
- 				ntohs(addr->sin6_port),
- 				protocol);
- 	}
- 	xprt->address_strings[RPC_DISPLAY_ALL] = buf;
- 
- 	buf = kzalloc(36, GFP_KERNEL);
- 	if (buf)
- 		snprintf(buf, 36, "%pi6", &addr->sin6_addr);
- 
- 	xprt->address_strings[RPC_DISPLAY_HEX_ADDR] = buf;
- 
- 	buf = kzalloc(8, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 8, "%4hx",
- 				ntohs(addr->sin6_port));
- 	}
- 	xprt->address_strings[RPC_DISPLAY_HEX_PORT] = buf;
- 
- 	buf = kzalloc(50, GFP_KERNEL);
- 	if (buf) {
- 		snprintf(buf, 50, "%pI6.%u.%u",
- 			 &addr->sin6_addr,
- 			 ntohs(addr->sin6_port) >> 8,
- 			 ntohs(addr->sin6_port) & 0xff);
- 	}
- 	xprt->address_strings[RPC_DISPLAY_UNIVERSAL_ADDR] = buf;
+ static void xs_update_peer_port(struct rpc_xprt *xprt)
+ {
+ 	kfree(xprt->address_strings[RPC_DISPLAY_HEX_PORT]);
+ 	kfree(xprt->address_strings[RPC_DISPLAY_PORT]);
  
- 	xprt->address_strings[RPC_DISPLAY_NETID] = netid;
+ 	xs_format_common_peer_ports(xprt);
  }
  
  static void xs_free_peer_addresses(struct rpc_xprt *xprt)
@@@ -1587,25 -1530,15 +1530,15 @@@ static unsigned short xs_get_random_por
   */
  static void xs_set_port(struct rpc_xprt *xprt, unsigned short port)
  {
- 	struct sockaddr *addr = xs_addr(xprt);
- 
  	dprintk("RPC:       setting port for xprt %p to %u\n", xprt, port);
  
- 	switch (addr->sa_family) {
- 	case AF_INET:
- 		((struct sockaddr_in *)addr)->sin_port = htons(port);
- 		break;
- 	case AF_INET6:
- 		((struct sockaddr_in6 *)addr)->sin6_port = htons(port);
- 		break;
- 	default:
- 		BUG();
- 	}
+ 	rpc_set_port(xs_addr(xprt), port);
+ 	xs_update_peer_port(xprt);
  }
  
  static unsigned short xs_get_srcport(struct sock_xprt *transport, struct socket *sock)
  {
- 	unsigned short port = transport->port;
+ 	unsigned short port = transport->srcport;
  
  	if (port == 0 && transport->xprt.resvport)
  		port = xs_get_random_port();
@@@ -1614,8 -1547,8 +1547,8 @@@
  
  static unsigned short xs_next_srcport(struct sock_xprt *transport, struct socket *sock, unsigned short port)
  {
- 	if (transport->port != 0)
- 		transport->port = 0;
+ 	if (transport->srcport != 0)
+ 		transport->srcport = 0;
  	if (!transport->xprt.resvport)
  		return 0;
  	if (port <= xprt_min_resvport || port > xprt_max_resvport)
@@@ -1633,7 -1566,7 +1566,7 @@@ static int xs_bind4(struct sock_xprt *t
  	unsigned short port = xs_get_srcport(transport, sock);
  	unsigned short last;
  
- 	sa = (struct sockaddr_in *)&transport->addr;
+ 	sa = (struct sockaddr_in *)&transport->srcaddr;
  	myaddr.sin_addr = sa->sin_addr;
  	do {
  		myaddr.sin_port = htons(port);
@@@ -1642,7 -1575,7 +1575,7 @@@
  		if (port == 0)
  			break;
  		if (err == 0) {
- 			transport->port = port;
+ 			transport->srcport = port;
  			break;
  		}
  		last = port;
@@@ -1666,7 -1599,7 +1599,7 @@@ static int xs_bind6(struct sock_xprt *t
  	unsigned short port = xs_get_srcport(transport, sock);
  	unsigned short last;
  
- 	sa = (struct sockaddr_in6 *)&transport->addr;
+ 	sa = (struct sockaddr_in6 *)&transport->srcaddr;
  	myaddr.sin6_addr = sa->sin6_addr;
  	do {
  		myaddr.sin6_port = htons(port);
@@@ -1675,7 -1608,7 +1608,7 @@@
  		if (port == 0)
  			break;
  		if (err == 0) {
- 			transport->port = port;
+ 			transport->srcport = port;
  			break;
  		}
  		last = port;
@@@ -1780,8 -1713,11 +1713,11 @@@ static void xs_udp_connect_worker4(stru
  		goto out;
  	}
  
- 	dprintk("RPC:       worker connecting xprt %p to address: %s\n",
- 			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
+ 	dprintk("RPC:       worker connecting xprt %p via %s to "
+ 				"%s (port %s)\n", xprt,
+ 			xprt->address_strings[RPC_DISPLAY_PROTO],
+ 			xprt->address_strings[RPC_DISPLAY_ADDR],
+ 			xprt->address_strings[RPC_DISPLAY_PORT]);
  
  	xs_udp_finish_connecting(xprt, sock);
  	status = 0;
@@@ -1822,8 -1758,11 +1758,11 @@@ static void xs_udp_connect_worker6(stru
  		goto out;
  	}
  
- 	dprintk("RPC:       worker connecting xprt %p to address: %s\n",
- 			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
+ 	dprintk("RPC:       worker connecting xprt %p via %s to "
+ 				"%s (port %s)\n", xprt,
+ 			xprt->address_strings[RPC_DISPLAY_PROTO],
+ 			xprt->address_strings[RPC_DISPLAY_ADDR],
+ 			xprt->address_strings[RPC_DISPLAY_PORT]);
  
  	xs_udp_finish_connecting(xprt, sock);
  	status = 0;
@@@ -1948,8 -1887,11 +1887,11 @@@ static void xs_tcp_setup_socket(struct 
  			goto out_eagain;
  	}
  
- 	dprintk("RPC:       worker connecting xprt %p to address: %s\n",
- 			xprt, xprt->address_strings[RPC_DISPLAY_ALL]);
+ 	dprintk("RPC:       worker connecting xprt %p via %s to "
+ 				"%s (port %s)\n", xprt,
+ 			xprt->address_strings[RPC_DISPLAY_PROTO],
+ 			xprt->address_strings[RPC_DISPLAY_ADDR],
+ 			xprt->address_strings[RPC_DISPLAY_PORT]);
  
  	status = xs_tcp_finish_connecting(xprt, sock);
  	dprintk("RPC:       %p connect status %d connected %d sock state %d\n",
@@@ -2120,7 -2062,7 +2062,7 @@@ static void xs_udp_print_stats(struct r
  	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
  
  	seq_printf(seq, "\txprt:\tudp %u %lu %lu %lu %lu %Lu %Lu\n",
- 			transport->port,
+ 			transport->srcport,
  			xprt->stat.bind_count,
  			xprt->stat.sends,
  			xprt->stat.recvs,
@@@ -2144,7 -2086,7 +2086,7 @@@ static void xs_tcp_print_stats(struct r
  		idle_time = (long)(jiffies - xprt->last_used) / HZ;
  
  	seq_printf(seq, "\txprt:\ttcp %u %lu %lu %lu %ld %lu %lu %lu %Lu %Lu\n",
- 			transport->port,
+ 			transport->srcport,
  			xprt->stat.bind_count,
  			xprt->stat.connect_count,
  			xprt->stat.connect_time,
@@@ -2223,7 -2165,7 +2165,7 @@@ static struct rpc_xprt *xs_setup_xprt(s
  	memcpy(&xprt->addr, args->dstaddr, args->addrlen);
  	xprt->addrlen = args->addrlen;
  	if (args->srcaddr)
- 		memcpy(&new->addr, args->srcaddr, args->addrlen);
+ 		memcpy(&new->srcaddr, args->srcaddr, args->addrlen);
  
  	return xprt;
  }
@@@ -2272,7 -2214,7 +2214,7 @@@ static struct rpc_xprt *xs_setup_udp(st
  
  		INIT_DELAYED_WORK(&transport->connect_worker,
  					xs_udp_connect_worker4);
- 		xs_format_ipv4_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP);
+ 		xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP);
  		break;
  	case AF_INET6:
  		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
@@@ -2280,15 -2222,22 +2222,22 @@@
  
  		INIT_DELAYED_WORK(&transport->connect_worker,
  					xs_udp_connect_worker6);
- 		xs_format_ipv6_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP6);
+ 		xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP6);
  		break;
  	default:
  		kfree(xprt);
  		return ERR_PTR(-EAFNOSUPPORT);
  	}
  
- 	dprintk("RPC:       set up transport to address %s\n",
- 			xprt->address_strings[RPC_DISPLAY_ALL]);
+ 	if (xprt_bound(xprt))
+ 		dprintk("RPC:       set up xprt to %s (port %s) via %s\n",
+ 				xprt->address_strings[RPC_DISPLAY_ADDR],
+ 				xprt->address_strings[RPC_DISPLAY_PORT],
+ 				xprt->address_strings[RPC_DISPLAY_PROTO]);
+ 	else
+ 		dprintk("RPC:       set up xprt to %s (autobind) via %s\n",
+ 				xprt->address_strings[RPC_DISPLAY_ADDR],
+ 				xprt->address_strings[RPC_DISPLAY_PROTO]);
  
  	if (try_module_get(THIS_MODULE))
  		return xprt;
@@@ -2337,23 -2286,33 +2286,33 @@@ static struct rpc_xprt *xs_setup_tcp(st
  		if (((struct sockaddr_in *)addr)->sin_port != htons(0))
  			xprt_set_bound(xprt);
  
- 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
- 		xs_format_ipv4_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
+ 		INIT_DELAYED_WORK(&transport->connect_worker,
+ 					xs_tcp_connect_worker4);
+ 		xs_format_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP);
  		break;
  	case AF_INET6:
  		if (((struct sockaddr_in6 *)addr)->sin6_port != htons(0))
  			xprt_set_bound(xprt);
  
- 		INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker6);
- 		xs_format_ipv6_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
+ 		INIT_DELAYED_WORK(&transport->connect_worker,
+ 					xs_tcp_connect_worker6);
+ 		xs_format_peer_addresses(xprt, "tcp", RPCBIND_NETID_TCP6);
  		break;
  	default:
  		kfree(xprt);
  		return ERR_PTR(-EAFNOSUPPORT);
  	}
  
- 	dprintk("RPC:       set up transport to address %s\n",
- 			xprt->address_strings[RPC_DISPLAY_ALL]);
+ 	if (xprt_bound(xprt))
+ 		dprintk("RPC:       set up xprt to %s (port %s) via %s\n",
+ 				xprt->address_strings[RPC_DISPLAY_ADDR],
+ 				xprt->address_strings[RPC_DISPLAY_PORT],
+ 				xprt->address_strings[RPC_DISPLAY_PROTO]);
+ 	else
+ 		dprintk("RPC:       set up xprt to %s (autobind) via %s\n",
+ 				xprt->address_strings[RPC_DISPLAY_ADDR],
+ 				xprt->address_strings[RPC_DISPLAY_PROTO]);
+ 
  
  	if (try_module_get(THIS_MODULE))
  		return xprt;
@@@ -2412,55 -2371,3 +2371,55 @@@ void cleanup_socket_xprt(void
  	xprt_unregister_transport(&xs_udp_transport);
  	xprt_unregister_transport(&xs_tcp_transport);
  }
 +
 +static int param_set_uint_minmax(const char *val, struct kernel_param *kp,
 +		unsigned int min, unsigned int max)
 +{
 +	unsigned long num;
 +	int ret;
 +
 +	if (!val)
 +		return -EINVAL;
 +	ret = strict_strtoul(val, 0, &num);
 +	if (ret == -EINVAL || num < min || num > max)
 +		return -EINVAL;
 +	*((unsigned int *)kp->arg) = num;
 +	return 0;
 +}
 +
 +static int param_set_portnr(const char *val, struct kernel_param *kp)
 +{
 +	return param_set_uint_minmax(val, kp,
 +			RPC_MIN_RESVPORT,
 +			RPC_MAX_RESVPORT);
 +}
 +
 +static int param_get_portnr(char *buffer, struct kernel_param *kp)
 +{
 +	return param_get_uint(buffer, kp);
 +}
 +#define param_check_portnr(name, p) \
 +	__param_check(name, p, unsigned int);
 +
 +module_param_named(min_resvport, xprt_min_resvport, portnr, 0644);
 +module_param_named(max_resvport, xprt_max_resvport, portnr, 0644);
 +
 +static int param_set_slot_table_size(const char *val, struct kernel_param *kp)
 +{
 +	return param_set_uint_minmax(val, kp,
 +			RPC_MIN_SLOT_TABLE,
 +			RPC_MAX_SLOT_TABLE);
 +}
 +
 +static int param_get_slot_table_size(char *buffer, struct kernel_param *kp)
 +{
 +	return param_get_uint(buffer, kp);
 +}
 +#define param_check_slot_table_size(name, p) \
 +	__param_check(name, p, unsigned int);
 +
 +module_param_named(tcp_slot_table_entries, xprt_tcp_slot_table_entries,
 +		   slot_table_size, 0644);
 +module_param_named(udp_slot_table_entries, xprt_udp_slot_table_entries,
 +		   slot_table_size, 0644);
 +