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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits)
  [SCSI] scsi_dh: fix kconfig related build errors
  [SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
  [SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
  [SCSI] make struct scsi_{host,target}_type static
  [SCSI] fix locking in host use of blk_plug_device()
  [SCSI] zfcp: Cleanup external header file
  [SCSI] zfcp: Cleanup code in zfcp_erp.c
  [SCSI] zfcp: zfcp_fsf cleanup.
  [SCSI] zfcp: consolidate sysfs things into one file.
  [SCSI] zfcp: Cleanup of code in zfcp_aux.c
  [SCSI] zfcp: Cleanup of code in zfcp_scsi.c
  [SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
  [SCSI] zfcp: Small QDIO cleanups
  [SCSI] zfcp: Adapter reopen for large number of unsolicited status
  [SCSI] zfcp: Fix error checking for ELS ADISC requests
  [SCSI] zfcp: wait until adapter is finished with ERP during auto-port
  [SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
  [SCSI] sg: Add target reset support
  [SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
  [SCSI] sd: Move scsi_disk() accessor function to sd.h
  ...

1 files changed, 21 insertions, 14 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index cbf55d59a54c..88d1b5f44e59 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -65,7 +65,7 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = {
 };
 #undef SP
 
-static struct kmem_cache *scsi_bidi_sdb_cache;
+static struct kmem_cache *scsi_sdb_cache;
 
 static void scsi_run_queue(struct request_queue *q);
 
@@ -784,7 +784,7 @@ void scsi_release_buffers(struct scsi_cmnd *cmd)
                 struct scsi_data_buffer *bidi_sdb =
                         cmd->request->next_rq->special;
                 scsi_free_sgtable(bidi_sdb);
-                kmem_cache_free(scsi_bidi_sdb_cache, bidi_sdb);
+                kmem_cache_free(scsi_sdb_cache, bidi_sdb);
                 cmd->request->next_rq->special = NULL;
         }
 }
@@ -1059,7 +1059,7 @@ int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask)
 
         if (blk_bidi_rq(cmd->request)) {
                 struct scsi_data_buffer *bidi_sdb = kmem_cache_zalloc(
-                        scsi_bidi_sdb_cache, GFP_ATOMIC);
+                        scsi_sdb_cache, GFP_ATOMIC);
                 if (!bidi_sdb) {
                         error = BLKPREP_DEFER;
                         goto err_exit;
@@ -1169,6 +1169,14 @@ int scsi_setup_fs_cmnd(struct scsi_device *sdev, struct request *req)
 
         if (ret != BLKPREP_OK)
                 return ret;
+
+        if (unlikely(sdev->scsi_dh_data && sdev->scsi_dh_data->scsi_dh
+                         && sdev->scsi_dh_data->scsi_dh->prep_fn)) {
+                ret = sdev->scsi_dh_data->scsi_dh->prep_fn(sdev, req);
+                if (ret != BLKPREP_OK)
+                        return ret;
+        }
+
         /*
          * Filesystem requests must transfer data.
          */
@@ -1329,7 +1337,6 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
                                 printk("scsi%d unblocking host at zero depth\n",
                                         shost->host_no));
                 } else {
-                        blk_plug_device(q);
                         return 0;
                 }
         }
@@ -1693,11 +1700,11 @@ int __init scsi_init_queue(void)
                 return -ENOMEM;
         }
 
-        scsi_bidi_sdb_cache = kmem_cache_create("scsi_bidi_sdb",
-                                        sizeof(struct scsi_data_buffer),
-                                        0, 0, NULL);
-        if (!scsi_bidi_sdb_cache) {
-                printk(KERN_ERR "SCSI: can't init scsi bidi sdb cache\n");
+        scsi_sdb_cache = kmem_cache_create("scsi_data_buffer",
+                                           sizeof(struct scsi_data_buffer),
+                                           0, 0, NULL);
+        if (!scsi_sdb_cache) {
+                printk(KERN_ERR "SCSI: can't init scsi sdb cache\n");
                 goto cleanup_io_context;
         }
 
@@ -1710,7 +1717,7 @@ int __init scsi_init_queue(void)
                 if (!sgp->slab) {
                         printk(KERN_ERR "SCSI: can't init sg slab %s\n",
                                         sgp->name);
-                        goto cleanup_bidi_sdb;
+                        goto cleanup_sdb;
                 }
 
                 sgp->pool = mempool_create_slab_pool(SG_MEMPOOL_SIZE,
@@ -1718,13 +1725,13 @@ int __init scsi_init_queue(void)
                 if (!sgp->pool) {
                         printk(KERN_ERR "SCSI: can't init sg mempool %s\n",
                                         sgp->name);
-                        goto cleanup_bidi_sdb;
+                        goto cleanup_sdb;
                 }
         }
 
         return 0;
 
-cleanup_bidi_sdb:
+cleanup_sdb:
         for (i = 0; i < SG_MEMPOOL_NR; i++) {
                 struct scsi_host_sg_pool *sgp = scsi_sg_pools + i;
                 if (sgp->pool)
@@ -1732,7 +1739,7 @@ cleanup_bidi_sdb:
                 if (sgp->slab)
                         kmem_cache_destroy(sgp->slab);
         }
-        kmem_cache_destroy(scsi_bidi_sdb_cache);
+        kmem_cache_destroy(scsi_sdb_cache);
 cleanup_io_context:
         kmem_cache_destroy(scsi_io_context_cache);
 
@@ -1744,7 +1751,7 @@ void scsi_exit_queue(void)
         int i;
 
         kmem_cache_destroy(scsi_io_context_cache);
-        kmem_cache_destroy(scsi_bidi_sdb_cache);
+        kmem_cache_destroy(scsi_sdb_cache);
 
         for (i = 0; i < SG_MEMPOOL_NR; i++) {
                 struct scsi_host_sg_pool *sgp = scsi_sg_pools + i;