[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1407151460-26888-1-git-send-email-jgross@suse.com>
Date: Mon, 4 Aug 2014 13:24:20 +0200
From: jgross@...e.com
To: James.Bottomley@...senPartnership.com, hch@...radead.org,
linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Juergen Gross <jgross@...e.com>
Subject: [PATCH V4] Save command pool address of Scsi_Host
From: Juergen Gross <jgross@...e.com>
If a scsi host driver specifies .cmd_len in it's scsi_host_template, a driver's
private command pool is needed. scsi_find_host_cmd_pool() will locate it, but
scsi_alloc_host_cmd_pool() isn't saving the pool address in the host template.
This will result in an access error when the host is removed.
Avoid the problem by saving the address of a new allocated command pool where
it is expected.
Signed-off-by: Juergen Gross <jgross@...e.com>
---
drivers/scsi/scsi.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 88d46fe..f654ac1 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -380,6 +380,10 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
pool->slab_flags |= SLAB_CACHE_DMA;
pool->gfp_mask = __GFP_DMA;
}
+
+ if (hostt->cmd_size)
+ hostt->cmd_pool = pool;
+
return pool;
}
@@ -424,8 +428,10 @@ out:
out_free_slab:
kmem_cache_destroy(pool->cmd_slab);
out_free_pool:
- if (hostt->cmd_size)
- scsi_free_host_cmd_pool(pool);
+ if (hostt->cmd_size) {
+ scsi_free_host_cmd_pool(hostt->cmd_pool);
+ hostt->cmd_pool = NULL;
+ }
goto out;
}
@@ -447,8 +453,10 @@ static void scsi_put_host_cmd_pool(struct Scsi_Host *shost)
if (!--pool->users) {
kmem_cache_destroy(pool->cmd_slab);
kmem_cache_destroy(pool->sense_slab);
- if (hostt->cmd_size)
- scsi_free_host_cmd_pool(pool);
+ if (hostt->cmd_size) {
+ scsi_free_host_cmd_pool(hostt->cmd_pool);
+ hostt->cmd_pool = NULL;
+ }
}
mutex_unlock(&host_cmd_pool_mutex);
}
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists