mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[SCSI] save command pool address of Scsi_Host
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 <[email protected]>
Reviewed-by: Hannes Reinecke <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Fixes: 89d9a56795
Cc: [email protected]
Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
parent
045065d8a3
commit
f6105c0808
1 changed files with 10 additions and 2 deletions
|
|
@ -377,6 +377,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;
|
||||
}
|
||||
|
||||
|
|
@ -421,8 +425,10 @@ out:
|
|||
out_free_slab:
|
||||
kmem_cache_destroy(pool->cmd_slab);
|
||||
out_free_pool:
|
||||
if (hostt->cmd_size)
|
||||
if (hostt->cmd_size) {
|
||||
scsi_free_host_cmd_pool(pool);
|
||||
hostt->cmd_pool = NULL;
|
||||
}
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
|
@ -444,8 +450,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)
|
||||
if (hostt->cmd_size) {
|
||||
scsi_free_host_cmd_pool(pool);
|
||||
hostt->cmd_pool = NULL;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&host_cmd_pool_mutex);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue