Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7dc753f0391ad94868609376f37be4833671b57d
Commit:     7dc753f0391ad94868609376f37be4833671b57d
Parent:     20612005c51a5ba1bb17902276b9216825958724
Author:     Chuck Lever <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 6 11:57:28 2007 -0400
Committer:  Trond Myklebust <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 17:16:08 2007 -0400

    SUNRPC: Rename xs_bind() to prepare for IPv6-specific bind method
    
    Prepare for introduction of IPv6-specific socket bind function.
    
    Signed-off-by: Chuck Lever <[EMAIL PROTECTED]>
    Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]>
---
 net/sunrpc/xprtsock.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index a2dddec..cd7c18b 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1227,7 +1227,7 @@ static void xs_set_port(struct rpc_xprt *xprt, unsigned 
short port)
        }
 }
 
-static int xs_bind(struct sock_xprt *transport, struct socket *sock)
+static int xs_bind4(struct sock_xprt *transport, struct socket *sock)
 {
        struct sockaddr_in myaddr = {
                .sin_family = AF_INET,
@@ -1255,8 +1255,9 @@ static int xs_bind(struct sock_xprt *transport, struct 
socket *sock)
                else
                        port--;
        } while (err == -EADDRINUSE && port != transport->port);
-       dprintk("RPC:       xs_bind "NIPQUAD_FMT":%u: %s (%d)\n",
-               NIPQUAD(myaddr.sin_addr), port, err ? "failed" : "ok", err);
+       dprintk("RPC:       %s "NIPQUAD_FMT":%u: %s (%d)\n",
+                       __FUNCTION__, NIPQUAD(myaddr.sin_addr),
+                       port, err ? "failed" : "ok", err);
        return err;
 }
 
@@ -1315,7 +1316,7 @@ static void xs_udp_connect_worker(struct work_struct 
*work)
        }
        xs_reclassify_socket(sock);
 
-       if (xs_bind(transport, sock)) {
+       if (xs_bind4(transport, sock)) {
                sock_release(sock);
                goto out;
        }
@@ -1402,7 +1403,7 @@ static void xs_tcp_connect_worker(struct work_struct 
*work)
                }
                xs_reclassify_socket(sock);
 
-               if (xs_bind(transport, sock)) {
+               if (xs_bind4(transport, sock)) {
                        sock_release(sock);
                        goto out;
                }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to