SUNRPC: Eliminate xprt_create_proto and rpc_create_client

[pandora-kernel.git] / net / sunrpc / xprt.c

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index e8c2bc4..e4f64fb 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -534,7 +534,7 @@ void xprt_connect(struct rpc_task *task)
        dprintk("RPC: %4d xprt_connect xprt %p %s connected\n", task->tk_pid,
                        xprt, (xprt_connected(xprt) ? "is" : "is not"));
 
-       if (!xprt->addr.sin_port) {
+       if (!xprt_bound(xprt)) {
                task->tk_status = -EIO;
                return;
        }
@@ -887,16 +887,32 @@ void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long i
        to->to_exponential = 0;
 }
 
-static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc_timeout *to)
+/**
+ * xprt_create_transport - create an RPC transport
+ * @proto: requested transport protocol
+ * @ap: remote peer address
+ * @size: length of address
+ * @to: timeout parameters
+ *
+ */
+struct rpc_xprt *xprt_create_transport(int proto, struct sockaddr *ap, size_t size, struct rpc_timeout *to)
 {
        int result;
        struct rpc_xprt *xprt;
        struct rpc_rqst *req;
 
-       if ((xprt = kzalloc(sizeof(struct rpc_xprt), GFP_KERNEL)) == NULL)
+       if ((xprt = kzalloc(sizeof(struct rpc_xprt), GFP_KERNEL)) == NULL) {
+               dprintk("RPC:      xprt_create_transport: no memory\n");
                return ERR_PTR(-ENOMEM);
-
-       xprt->addr = *ap;
+       }
+       if (size <= sizeof(xprt->addr)) {
+               memcpy(&xprt->addr, ap, size);
+               xprt->addrlen = size;
+       } else {
+               kfree(xprt);
+               dprintk("RPC:      xprt_create_transport: address too large\n");
+               return ERR_PTR(-EBADF);
+       }
 
        switch (proto) {
        case IPPROTO_UDP:
@@ -908,11 +924,11 @@ static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc
        default:
                printk(KERN_ERR "RPC: unrecognized transport protocol: %d\n",
                                proto);
-               result = -EIO;
-               break;
+               return ERR_PTR(-EIO);
        }
        if (result) {
                kfree(xprt);
+               dprintk("RPC:      xprt_create_transport: failed, %d\n", result);
                return ERR_PTR(result);
        }
 
@@ -928,6 +944,7 @@ static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc
        xprt->last_used = jiffies;
        xprt->cwnd = RPC_INITCWND;
 
+       rpc_init_wait_queue(&xprt->binding, "xprt_binding");
        rpc_init_wait_queue(&xprt->pending, "xprt_pending");
        rpc_init_wait_queue(&xprt->sending, "xprt_sending");
        rpc_init_wait_queue(&xprt->resend, "xprt_resend");
@@ -941,26 +958,7 @@ static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc
 
        dprintk("RPC:      created transport %p with %u slots\n", xprt,
                        xprt->max_reqs);
-       
-       return xprt;
-}
-
-/**
- * xprt_create_proto - create an RPC client transport
- * @proto: requested transport protocol
- * @sap: remote peer's address
- * @to: timeout parameters for new transport
- *
- */
-struct rpc_xprt *xprt_create_proto(int proto, struct sockaddr_in *sap, struct rpc_timeout *to)
-{
-       struct rpc_xprt *xprt;
 
-       xprt = xprt_setup(proto, sap, to);
-       if (IS_ERR(xprt))
-               dprintk("RPC:      xprt_create_proto failed\n");
-       else
-               dprintk("RPC:      xprt_create_proto created xprt %p\n", xprt);
        return xprt;
 }