[SCSI] don't use __GFP_DMA for sense buffers if not required
Only hosts which actually have ISA DMA requirements need sense buffers coming out of ZONE_DMA, so only use the __GFP_DMA flag for that case to avoid allocating this scarce resource if it's not necessary. [tomo: fixed slab leak in failure case] Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
@@ -268,7 +268,6 @@ static void scsi_host_dev_release(struct device *dev)
|
||||
}
|
||||
|
||||
scsi_destroy_command_freelist(shost);
|
||||
scsi_destroy_command_sense_buffer(shost);
|
||||
if (shost->bqt)
|
||||
blk_free_tags(shost->bqt);
|
||||
|
||||
@@ -373,13 +372,9 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
|
||||
else
|
||||
shost->dma_boundary = 0xffffffff;
|
||||
|
||||
rval = scsi_setup_command_sense_buffer(shost);
|
||||
if (rval)
|
||||
goto fail_kfree;
|
||||
|
||||
rval = scsi_setup_command_freelist(shost);
|
||||
if (rval)
|
||||
goto fail_destroy_sense;
|
||||
goto fail_kfree;
|
||||
|
||||
device_initialize(&shost->shost_gendev);
|
||||
snprintf(shost->shost_gendev.bus_id, BUS_ID_SIZE, "host%d",
|
||||
@@ -404,8 +399,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
|
||||
|
||||
fail_destroy_freelist:
|
||||
scsi_destroy_command_freelist(shost);
|
||||
fail_destroy_sense:
|
||||
scsi_destroy_command_sense_buffer(shost);
|
||||
fail_kfree:
|
||||
kfree(shost);
|
||||
return NULL;
|
||||
|
Reference in New Issue
Block a user