From a1b09d27f976687f172fe41662cbfd9f7000495b Mon Sep 17 00:00:00 2001 From: patiencew Date: Wed, 24 Oct 2007 20:53:43 +0000 Subject: [PATCH] git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1996 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/kernel/ktcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/trunk/ceph/kernel/ktcp.c b/trunk/ceph/kernel/ktcp.c index 235160a1f492f..de49129d8bd78 100644 --- a/trunk/ceph/kernel/ktcp.c +++ b/trunk/ceph/kernel/ktcp.c @@ -6,23 +6,24 @@ #include "ktcp.h" -int _kconnect(struct sockaddr *saddr, struct socket **sd) +struct socket * _kconnect(struct sockaddr *saddr) { int ret; + struct socket *sd = NULL; - ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, sd); + ret = sock_create_kern(AF_INET, SOCK_STREAM, IPPROTO_TCP, &sd); if (ret < 0) { printk(KERN_INFO "sock_create_kern error: %d\n", ret); } else { /* or could call kernel_connect(), opted to reduce call overhead */ - ret = (*sd)->ops->connect(*sd, (struct sockaddr *) saddr, + ret = sd->ops->connect(sd, (struct sockaddr *) saddr, sizeof (struct sockaddr_in),0); if (ret < 0) { printk(KERN_INFO "kernel_connect error: %d\n", ret); - sock_release(*sd); + sock_release(sd); } } - return(ret); + return(sd); } struct socket * _klisten(struct sockaddr *saddr) -- 2.39.5