Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/scsi/iscsi_tcp.h b/drivers/scsi/iscsi_tcp.h
index 855f2dfd18af..f95e61b76f70 100644
--- a/drivers/scsi/iscsi_tcp.h
+++ b/drivers/scsi/iscsi_tcp.h
@@ -158,7 +158,7 @@ struct iscsi_conn {
         struct kfifo            *mgmtqueue;     /* mgmt (control) xmit queue */
         struct kfifo            *xmitqueue;     /* data-path cmd queue */
         struct work_struct      xmitwork;       /* per-conn. xmit workqueue */
-        struct semaphore        xmitsema;       /* serializes connection xmit,
+        struct mutex            xmitmutex;      /* serializes connection xmit,
                                                  * access to kfifos:      *
                                                  * xmitqueue, writequeue, *
                                                  * immqueue, mgmtqueue    */
@@ -191,6 +191,8 @@ struct iscsi_conn {
         uint32_t                sendpage_failures_cnt;
         uint32_t                discontiguous_hdr_cnt;
         uint32_t                eh_abort_cnt;
+
+        ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int);
 };
 
 struct iscsi_session {
@@ -240,8 +242,8 @@ struct iscsi_session {
 
 struct iscsi_buf {
         struct scatterlist      sg;
-        struct kvec             iov;
         unsigned int            sent;
+        char                    use_sendmsg;
 };
 
 struct iscsi_data_task {