diff options
author | Sridhar Samudrala <sri@us.ibm.com> | 2006-08-07 23:58:01 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:06 -0400 |
commit | e6242e928ef1e4ed853f909a7479e4934f4bcb70 (patch) | |
tree | f348f28e1993c73b2683f7edf87ef673ad2d5ec8 /net/sunrpc/xprtsock.c | |
parent | ac5a488ef252ed673cb067843e411f8cc43f7ab9 (diff) |
[SUNRPC]: Update to use in-kernel sockets API.
Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r-- | net/sunrpc/xprtsock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 441bd53f5eca..8b319e375049 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -207,7 +207,7 @@ static inline int xs_sendpages(struct socket *sock, struct sockaddr *addr, int a | |||
207 | base &= ~PAGE_CACHE_MASK; | 207 | base &= ~PAGE_CACHE_MASK; |
208 | } | 208 | } |
209 | 209 | ||
210 | sendpage = sock->ops->sendpage ? : sock_no_sendpage; | 210 | sendpage = kernel_sendpage; |
211 | do { | 211 | do { |
212 | int flags = XS_SENDMSG_FLAGS; | 212 | int flags = XS_SENDMSG_FLAGS; |
213 | 213 | ||
@@ -986,7 +986,7 @@ static int xs_bindresvport(struct rpc_xprt *xprt, struct socket *sock) | |||
986 | 986 | ||
987 | do { | 987 | do { |
988 | myaddr.sin_port = htons(port); | 988 | myaddr.sin_port = htons(port); |
989 | err = sock->ops->bind(sock, (struct sockaddr *) &myaddr, | 989 | err = kernel_bind(sock, (struct sockaddr *) &myaddr, |
990 | sizeof(myaddr)); | 990 | sizeof(myaddr)); |
991 | if (err == 0) { | 991 | if (err == 0) { |
992 | xprt->port = port; | 992 | xprt->port = port; |
@@ -1081,7 +1081,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt) | |||
1081 | */ | 1081 | */ |
1082 | memset(&any, 0, sizeof(any)); | 1082 | memset(&any, 0, sizeof(any)); |
1083 | any.sa_family = AF_UNSPEC; | 1083 | any.sa_family = AF_UNSPEC; |
1084 | result = sock->ops->connect(sock, &any, sizeof(any), 0); | 1084 | result = kernel_connect(sock, &any, sizeof(any), 0); |
1085 | if (result) | 1085 | if (result) |
1086 | dprintk("RPC: AF_UNSPEC connect return code %d\n", | 1086 | dprintk("RPC: AF_UNSPEC connect return code %d\n", |
1087 | result); | 1087 | result); |
@@ -1151,7 +1151,7 @@ static void xs_tcp_connect_worker(void *args) | |||
1151 | /* Tell the socket layer to start connecting... */ | 1151 | /* Tell the socket layer to start connecting... */ |
1152 | xprt->stat.connect_count++; | 1152 | xprt->stat.connect_count++; |
1153 | xprt->stat.connect_start = jiffies; | 1153 | xprt->stat.connect_start = jiffies; |
1154 | status = sock->ops->connect(sock, (struct sockaddr *) &xprt->addr, | 1154 | status = kernel_connect(sock, (struct sockaddr *) &xprt->addr, |
1155 | sizeof(xprt->addr), O_NONBLOCK); | 1155 | sizeof(xprt->addr), O_NONBLOCK); |
1156 | dprintk("RPC: %p connect status %d connected %d sock state %d\n", | 1156 | dprintk("RPC: %p connect status %d connected %d sock state %d\n", |
1157 | xprt, -status, xprt_connected(xprt), sock->sk->sk_state); | 1157 | xprt, -status, xprt_connected(xprt), sock->sk->sk_state); |