Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)
  [SCSI] libsas: make ATA functions selectable by a config option
  [SCSI] bsg: unexport sg v3 helper functions
  [SCSI] bsg: fix bsg_unregister_queue
  [SCSI] bsg: make class backlinks
  [SCSI] 3w-9xxx: add support for 9690SA
  [SCSI] bsg: fix bsg_register_queue error path
  [SCSI] ESP: Increase ESP_BUS_TIMEOUT to 275.
  [SCSI] libsas: fix scr_read/write users and update the libata documentation
  [SCSI] mpt fusion: update Kconfig help
  [SCSI] scsi_transport_sas: add destructor for bsg
  [SCSI] iscsi_tcp: buggered kmalloc()
  [SCSI] qla2xxx: Update version number to 8.02.00-k2.
  [SCSI] qla2xxx: Add ISP25XX support.
  [SCSI] qla2xxx: Use pci_try_set_mwi().
  [SCSI] qla2xxx: Use PCI-X/PCI-Express read control interfaces.
  [SCSI] qla2xxx: Re-factor isp_operations to static structures.
  [SCSI] qla2xxx: Validate mid-layer 'underflow' during check-condition handling.
  [SCSI] qla2xxx: Correct setting of 'current' and 'supported' speeds during FDMI registration.
  [SCSI] qla2xxx: Generalize iIDMA support.
  [SCSI] qla2xxx: Generalize FW-Interface-2 support.
  ...

5 files changed, 38 insertions, 90 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 9726261c367d..ab5ec1feaf4e 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -1526,15 +1526,12 @@ zfcp_gid_pn_buffers_alloc(struct zfcp_gid_pn_data **gid_pn, mempool_t *pool)
  * zfcp_gid_pn_buffers_free - free buffers for GID_PN nameserver request
  * @gid_pn: pointer to struct zfcp_gid_pn_data which has to be freed
  */
-static void
-zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
+static void zfcp_gid_pn_buffers_free(struct zfcp_gid_pn_data *gid_pn)
 {
-        if ((gid_pn->ct.pool != 0))
+        if (gid_pn->ct.pool)
                 mempool_free(gid_pn, gid_pn->ct.pool);
         else
-                kfree(gid_pn);
-
-        return;
+                kfree(gid_pn);
 }
 
 /**
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 22649639230b..b36dfc40d9fa 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -126,6 +126,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list)
 #define ZFCP_MIN_OUTPUT_THRESHOLD       1       /* ignored by QDIO layer */
 
 #define QDIO_SCSI_QFMT                  1       /* 1 for FSF */
+#define QBUFF_PER_PAGE                  (PAGE_SIZE / sizeof(struct qdio_buffer))
 
 /********************* FSF SPECIFIC DEFINES *********************************/
 
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 4e7cb6dc4d34..d8cd75ce2d9a 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1626,7 +1626,7 @@ zfcp_erp_schedule_work(struct zfcp_unit *unit)
 {
         struct zfcp_erp_add_work *p;
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (!p) {
                 ZFCP_LOG_NORMAL("error: Out of resources. Could not register "
                                 "the FCP-LUN 0x%Lx connected to "
@@ -1639,7 +1639,6 @@ zfcp_erp_schedule_work(struct zfcp_unit *unit)
         }
 
         zfcp_unit_get(unit);
-        memset(p, 0, sizeof(*p));
         atomic_set_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);
         INIT_WORK(&p->work, zfcp_erp_scsi_scan);
         p->unit = unit;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 0eb31e162b15..b240800b78d7 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1930,7 +1930,7 @@ static int zfcp_fsf_send_els_handler(struct zfcp_fsf_req *fsf_req)
 skip_fsfstatus:
         send_els->status = retval;
 
-        if (send_els->handler != 0)
+        if (send_els->handler)
                 send_els->handler(send_els->handler_data);
 
         return retval;
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index bdf5782b8a7a..c408badd2ae9 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -47,103 +47,56 @@ static int zfcp_qdio_handler_error_check(struct zfcp_adapter *,
 #define ZFCP_LOG_AREA                   ZFCP_LOG_AREA_QDIO
 
 /*
- * Allocates BUFFER memory to each of the pointers of the qdio_buffer_t 
- * array in the adapter struct.
- * Cur_buf is the pointer array and count can be any number of required 
- * buffers, the page-fitting arithmetic is done entirely within this funciton.
+ * Frees BUFFER memory for each of the pointers of the struct qdio_buffer array
+ * in the adapter struct sbuf is the pointer array.
  *
- * returns:     number of buffers allocated
  * locks:       must only be called with zfcp_data.config_sema taken
  */
-static int
-zfcp_qdio_buffers_enqueue(struct qdio_buffer **cur_buf, int count)
+static void
+zfcp_qdio_buffers_dequeue(struct qdio_buffer **sbuf)
 {
-        int buf_pos;
-        int qdio_buffers_per_page;
-        int page_pos = 0;
-        struct qdio_buffer *first_in_page = NULL;
-
-        qdio_buffers_per_page = PAGE_SIZE / sizeof (struct qdio_buffer);
-        ZFCP_LOG_TRACE("buffers_per_page=%d\n", qdio_buffers_per_page);
-
-        for (buf_pos = 0; buf_pos < count; buf_pos++) {
-                if (page_pos == 0) {
-                        cur_buf[buf_pos] = (struct qdio_buffer *)
-                            get_zeroed_page(GFP_KERNEL);
-                        if (cur_buf[buf_pos] == NULL) {
-                                ZFCP_LOG_INFO("error: allocation of "
-                                              "QDIO buffer failed \n");
-                                goto out;
-                        }
-                        first_in_page = cur_buf[buf_pos];
-                } else {
-                        cur_buf[buf_pos] = first_in_page + page_pos;
+        int pos;
 
-                }
-                /* was initialised to zero */
-                page_pos++;
-                page_pos %= qdio_buffers_per_page;
-        }
- out:
-        return buf_pos;
+        for (pos = 0; pos < QDIO_MAX_BUFFERS_PER_Q; pos += QBUFF_PER_PAGE)
+                free_page((unsigned long) sbuf[pos]);
 }
 
 /*
- * Frees BUFFER memory for each of the pointers of the struct qdio_buffer array
- * in the adapter struct cur_buf is the pointer array and count can be any
- * number of buffers in the array that should be freed starting from buffer 0
+ * Allocates BUFFER memory to each of the pointers of the qdio_buffer_t
+ * array in the adapter struct.
+ * Cur_buf is the pointer array
  *
+ * returns:     zero on success else -ENOMEM
  * locks:       must only be called with zfcp_data.config_sema taken
  */
-static void
-zfcp_qdio_buffers_dequeue(struct qdio_buffer **cur_buf, int count)
+static int
+zfcp_qdio_buffers_enqueue(struct qdio_buffer **sbuf)
 {
-        int buf_pos;
-        int qdio_buffers_per_page;
-
-        qdio_buffers_per_page = PAGE_SIZE / sizeof (struct qdio_buffer);
-        ZFCP_LOG_TRACE("buffers_per_page=%d\n", qdio_buffers_per_page);
+        int pos;
 
-        for (buf_pos = 0; buf_pos < count; buf_pos += qdio_buffers_per_page)
-                free_page((unsigned long) cur_buf[buf_pos]);
-        return;
+        for (pos = 0; pos < QDIO_MAX_BUFFERS_PER_Q; pos += QBUFF_PER_PAGE) {
+                sbuf[pos] = (struct qdio_buffer *) get_zeroed_page(GFP_KERNEL);
+                if (!sbuf[pos]) {
+                        zfcp_qdio_buffers_dequeue(sbuf);
+                        return -ENOMEM;
+                }
+        }
+        for (pos = 0; pos < QDIO_MAX_BUFFERS_PER_Q; pos++)
+                if (pos % QBUFF_PER_PAGE)
+                        sbuf[pos] = sbuf[pos - 1] + 1;
+        return 0;
 }
 
 /* locks:       must only be called with zfcp_data.config_sema taken */
 int
 zfcp_qdio_allocate_queues(struct zfcp_adapter *adapter)
 {
-        int buffer_count;
-        int retval = 0;
+        int ret;
 
-        buffer_count =
-            zfcp_qdio_buffers_enqueue(&(adapter->request_queue.buffer[0]),
-                                      QDIO_MAX_BUFFERS_PER_Q);
-        if (buffer_count < QDIO_MAX_BUFFERS_PER_Q) {
-                ZFCP_LOG_DEBUG("only %d QDIO buffers allocated for request "
-                               "queue\n", buffer_count);
-                zfcp_qdio_buffers_dequeue(&(adapter->request_queue.buffer[0]),
-                                          buffer_count);
-                retval = -ENOMEM;
-                goto out;
-        }
-
-        buffer_count =
-            zfcp_qdio_buffers_enqueue(&(adapter->response_queue.buffer[0]),
-                                      QDIO_MAX_BUFFERS_PER_Q);
-        if (buffer_count < QDIO_MAX_BUFFERS_PER_Q) {
-                ZFCP_LOG_DEBUG("only %d QDIO buffers allocated for response "
-                               "queue", buffer_count);
-                zfcp_qdio_buffers_dequeue(&(adapter->response_queue.buffer[0]),
-                                          buffer_count);
-                ZFCP_LOG_TRACE("freeing request_queue buffers\n");
-                zfcp_qdio_buffers_dequeue(&(adapter->request_queue.buffer[0]),
-                                          QDIO_MAX_BUFFERS_PER_Q);
-                retval = -ENOMEM;
-                goto out;
-        }
- out:
-        return retval;
+        ret = zfcp_qdio_buffers_enqueue(adapter->request_queue.buffer);
+        if (ret)
+                return ret;
+        return zfcp_qdio_buffers_enqueue(adapter->response_queue.buffer);
 }
 
 /* locks:       must only be called with zfcp_data.config_sema taken */
@@ -151,12 +104,10 @@ void
 zfcp_qdio_free_queues(struct zfcp_adapter *adapter)
 {
         ZFCP_LOG_TRACE("freeing request_queue buffers\n");
-        zfcp_qdio_buffers_dequeue(&(adapter->request_queue.buffer[0]),
-                                  QDIO_MAX_BUFFERS_PER_Q);
+        zfcp_qdio_buffers_dequeue(adapter->request_queue.buffer);
 
         ZFCP_LOG_TRACE("freeing response_queue buffers\n");
-        zfcp_qdio_buffers_dequeue(&(adapter->response_queue.buffer[0]),
-                                  QDIO_MAX_BUFFERS_PER_Q);
+        zfcp_qdio_buffers_dequeue(adapter->response_queue.buffer);
 }
 
 int