[SCSI] iscsi: add transport end point callbacks

add transport end point callbacks so iscsi drivers that cannot connect
from userspace, like iscsi tcp, using sockets do not have to
implement their own socket infrastructure.

Signed-off-by: Or Gerlitz <ogerlitz@voltaire.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 42 insertions, 3 deletions

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index fe00a3f6d204..ac507daacfeb 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1975,7 +1975,7 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)
 
 static int
 iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
-                    struct iscsi_cls_conn *cls_conn, uint32_t transport_fd,
+                    struct iscsi_cls_conn *cls_conn, uint64_t transport_eph,
                     int is_leading)
 {
         struct iscsi_conn *conn = cls_conn->dd_data;
@@ -1985,7 +1985,7 @@ iscsi_tcp_conn_bind(struct iscsi_cls_session *cls_session,
         int err;
 
         /* lookup for existing socket */
-        sock = sockfd_lookup(transport_fd, &err);
+        sock = sockfd_lookup((int)transport_eph, &err);
         if (!sock) {
                 printk(KERN_ERR "iscsi_tcp: sockfd_lookup failed %d\n", err);
                 return -EEXIST;
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index bc9071d2d212..7b7a194822da 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -929,6 +929,40 @@ iscsi_set_param(struct iscsi_transport *transport, struct iscsi_uevent *ev)
 }
 
 static int
+iscsi_if_transport_ep(struct iscsi_transport *transport,
+                      struct iscsi_uevent *ev, int msg_type)
+{
+        struct sockaddr *dst_addr;
+        int rc = 0;
+
+        switch (msg_type) {
+        case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:
+                if (!transport->ep_connect)
+                        return -EINVAL;
+
+                dst_addr = (struct sockaddr *)((char*)ev + sizeof(*ev));
+                rc = transport->ep_connect(dst_addr,
+                                           ev->u.ep_connect.non_blocking,
+                                           &ev->r.ep_connect_ret.handle);
+                break;
+        case ISCSI_UEVENT_TRANSPORT_EP_POLL:
+                if (!transport->ep_poll)
+                        return -EINVAL;
+
+                ev->r.retcode = transport->ep_poll(ev->u.ep_poll.ep_handle,
+                                                   ev->u.ep_poll.timeout_ms);
+                break;
+        case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:
+                if (!transport->ep_disconnect)
+                        return -EINVAL;
+
+                transport->ep_disconnect(ev->u.ep_disconnect.ep_handle);
+                break;
+        }
+        return rc;
+}
+
+static int
 iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 {
         int err = 0;
@@ -974,7 +1008,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
                 if (session && conn)
                         ev->r.retcode = transport->bind_conn(session, conn,
-                                        ev->u.b_conn.transport_fd,
+                                        ev->u.b_conn.transport_eph,
                                         ev->u.b_conn.is_leading);
                 else
                         err = -EINVAL;
@@ -1009,6 +1043,11 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
         case ISCSI_UEVENT_GET_STATS:
                 err = iscsi_if_get_stats(transport, nlh);
                 break;
+        case ISCSI_UEVENT_TRANSPORT_EP_CONNECT:
+        case ISCSI_UEVENT_TRANSPORT_EP_POLL:
+        case ISCSI_UEVENT_TRANSPORT_EP_DISCONNECT:
+                err = iscsi_if_transport_ep(transport, ev, nlh->nlmsg_type);
+                break;
         default:
                 err = -EINVAL;
                 break;