target: remove the unused struct iblock_hba

There is no reason to allocate a struct just to store the host number for
a debug printk in the detach path.  I've simply removed the verbose
debugging given that the calling code thinks the number passed in is
something different from a host ID anyway.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 8572eae62da7a20399216db03ea04fe9fa1dde3e..562e787b31d0862ac79000fe7781d5807c80c958 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -56,51 +56,25 @@ static void iblock_bio_done(struct bio *, int);
  */
 static int iblock_attach_hba(struct se_hba *hba, u32 host_id)
 {
-       struct iblock_hba *ib_host;
-
-       ib_host = kzalloc(sizeof(struct iblock_hba), GFP_KERNEL);
-       if (!ib_host) {
-               pr_err("Unable to allocate memory for"
-                               " struct iblock_hba\n");
-               return -ENOMEM;
-       }
-
-       ib_host->iblock_host_id = host_id;
-
-       hba->hba_ptr = ib_host;
-
        pr_debug("CORE_HBA[%d] - TCM iBlock HBA Driver %s on"
                " Generic Target Core Stack %s\n", hba->hba_id,
                IBLOCK_VERSION, TARGET_CORE_MOD_VERSION);
-
-       pr_debug("CORE_HBA[%d] - Attached iBlock HBA: %u to Generic\n",
-               hba->hba_id, ib_host->iblock_host_id);
-
        return 0;
 }
 
 static void iblock_detach_hba(struct se_hba *hba)
 {
-       struct iblock_hba *ib_host = hba->hba_ptr;
-
-       pr_debug("CORE_HBA[%d] - Detached iBlock HBA: %u from Generic"
-               " Target Core\n", hba->hba_id, ib_host->iblock_host_id);
-
-       kfree(ib_host);
-       hba->hba_ptr = NULL;
 }
 
 static void *iblock_allocate_virtdevice(struct se_hba *hba, const char *name)
 {
        struct iblock_dev *ib_dev = NULL;
-       struct iblock_hba *ib_host = hba->hba_ptr;
 
        ib_dev = kzalloc(sizeof(struct iblock_dev), GFP_KERNEL);
        if (!ib_dev) {
                pr_err("Unable to allocate struct iblock_dev\n");
                return NULL;
        }
-       ib_dev->ibd_host = ib_host;
 
        pr_debug( "IBLOCK: Allocated ib_dev for %s\n", name);
 

diff --git a/drivers/target/target_core_iblock.h b/drivers/target/target_core_iblock.h
index 5cf1860c10d037b92a7a5b0a7c3933273e287856..3006104174474f5502401c55c78b86912e0d1c5d 100644 (file)
--- a/drivers/target/target_core_iblock.h
+++ b/drivers/target/target_core_iblock.h
@@ -19,11 +19,6 @@ struct iblock_dev {
        u32     ibd_flags;
        struct bio_set  *ibd_bio_set;
        struct block_device *ibd_bd;
-       struct iblock_hba *ibd_host;
-} ____cacheline_aligned;
-
-struct iblock_hba {
-       int             iblock_host_id;
 } ____cacheline_aligned;
 
 #endif /* TARGET_CORE_IBLOCK_H */