Move some tests depending on the transport from inode.c to xprtsock.c. Signed-off-by: Gilles Quillard Signed-off-by: Aurelien Charbon --- fs/nfs/inode.c | 16 ++-------------- net/sunrpc/xprtsock.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 14 deletions(-) --- diff -Nru linux-2.6.11/fs/nfs/inode.c linux-2.6.11-01/fs/nfs/inode.c --- linux-2.6.11/fs/nfs/inode.c 2005-03-14 14:51:31.000000000 +0100 +++ linux-2.6.11-01/fs/nfs/inode.c 2005-03-14 16:27:37.000000000 +0100 @@ -1733,9 +1733,8 @@ struct nfs_server *server = data; struct nfs_server *old = NFS_SB(sb); - if (old->addr.sin_addr.s_addr != server->addr.sin_addr.s_addr) - return 0; - if (old->addr.sin_port != server->addr.sin_port) + if (memcmp((void *)&old->addr, (void *)&server->addr, + sizeof(struct sockaddr_in))) return 0; return !nfs_compare_fh(&old->fh, &server->fh); } @@ -1791,11 +1790,6 @@ /* We now require that the mount process passes the remote address */ memcpy(&server->addr, &data->addr, sizeof(server->addr)); - if (server->addr.sin_addr.s_addr == INADDR_ANY) { - printk("NFS: mount program didn't pass remote address!\n"); - kfree(server); - return ERR_PTR(-EINVAL); - } s = sget(fs_type, nfs_compare_super, nfs_set_super, server); @@ -2178,12 +2172,6 @@ s = ERR_PTR(-EFAULT); goto out_free; } - if (server->addr.sin_family != AF_INET || - server->addr.sin_addr.s_addr == INADDR_ANY) { - printk("NFS: mount program didn't pass remote IP address!\n"); - s = ERR_PTR(-EINVAL); - goto out_free; - } s = sget(fs_type, nfs4_compare_super, nfs_set_super, server); diff -Nru linux-2.6.11/net/sunrpc/xprtsock.c linux-2.6.11-01/net/sunrpc/xprtsock.c --- linux-2.6.11/net/sunrpc/xprtsock.c 2005-03-14 14:51:31.000000000 +0100 +++ linux-2.6.11-01/net/sunrpc/xprtsock.c 2005-03-14 16:27:37.000000000 +0100 @@ -1835,12 +1835,16 @@ */ static int xs_setup_udp(struct rpc_xprt *xprt, struct rpc_timeout *to) { + struct sockaddr_in *sap = (struct sockaddr_in *) &xprt->addr; struct xs_private *priv; char buf[256]; xs_print_udp_ipv4_address(xprt, sizeof(buf), buf, 0x7); dprintk("RPC: setting up transport to address %s\n", buf); + if (sap->sin_addr.s_addr == INADDR_ANY) + return -EINVAL; + xprt->max_reqs = xprt_udp_slot_table_entries; priv = kmalloc(sizeof(struct xs_private), GFP_KERNEL); @@ -1886,12 +1890,16 @@ */ static int xs_setup_tcp(struct rpc_xprt *xprt, struct rpc_timeout *to) { + struct sockaddr_in *sap = (struct sockaddr_in *) &xprt->addr; struct xs_private *priv; char buf[256]; xs_print_tcp_ipv4_address(xprt, sizeof(buf), buf, 0x7); dprintk("RPC: setting up transport to address %s\n", buf); + if (sap->sin_addr.s_addr == INADDR_ANY) + return -EINVAL; + xprt->max_reqs = xprt_tcp_slot_table_entries; priv = kmalloc(sizeof(struct xs_private), GFP_KERNEL); @@ -1936,12 +1944,18 @@ */ static int xs_setup_udp6(struct rpc_xprt *xprt, struct rpc_timeout *to) { + struct sockaddr_in6 *sap = (struct sockaddr_in6 *) &xprt->addr; + struct in6_addr *addr = &sap->sin6_addr; struct xs_private *priv; char buf[256]; xs_print_udp_ipv6_address(xprt, sizeof(buf), buf, 0x7); dprintk("RPC: setting up transport to address %s\n", buf); + if (addr->s6_addr32[0] == 0 && addr->s6_addr32[1] == 0 && + addr->s6_addr32[2] == 0 && addr->s6_addr32[3] == 0) + return -EINVAL; + xprt->max_reqs = xprt_udp_slot_table_entries; priv = kmalloc(sizeof(struct xs_private), GFP_KERNEL); @@ -1987,12 +2001,18 @@ */ static int xs_setup_tcp6(struct rpc_xprt *xprt, struct rpc_timeout *to) { + struct sockaddr_in6 *sap = (struct sockaddr_in6 *) &xprt->addr; + struct in6_addr *addr = &sap->sin6_addr; struct xs_private *priv; char buf[256]; xs_print_tcp_ipv6_address(xprt, sizeof(buf), buf, 0x7); dprintk("RPC: setting up transport to address %s\n", buf); + if (addr->s6_addr32[0] == 0 && addr->s6_addr32[1] == 0 && + addr->s6_addr32[2] == 0 && addr->s6_addr32[3] == 0) + return -EINVAL; + xprt->max_reqs = xprt_tcp_slot_table_entries; priv = kmalloc(sizeof(struct xs_private), GFP_KERNEL);