diff options
| author | Rob Evers <revers@redhat.com> | 2014-12-16 11:01:18 -0500 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-01-09 15:44:15 +0100 |
| commit | eb9eea01d4d8ce86eeee52cdd40029fd1a549721 (patch) | |
| tree | 034d1d67a573507b37b22bb0c02ef46089acfc6c /drivers/scsi/scsi_scan.c | |
| parent | 6583f6fb82296b737053dff154a1e7a9c174754e (diff) | |
| download | lwn-eb9eea01d4d8ce86eeee52cdd40029fd1a549721.tar.gz lwn-eb9eea01d4d8ce86eeee52cdd40029fd1a549721.zip | |
scsi: avoid unnecessary GFP_ATOMIC allocation in scsi_report_lun_scan
Signed-off-by: Rob Evers <revers@redhat.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 983aed10ff2f..9edae2f3e879 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1416,7 +1416,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, * prevent us from finding any LUNs on this target. */ length = (max_scsi_report_luns + 1) * sizeof(struct scsi_lun); - lun_data = kmalloc(length, GFP_ATOMIC | + lun_data = kmalloc(length, GFP_KERNEL | (sdev->host->unchecked_isa_dma ? __GFP_DMA : 0)); if (!lun_data) { printk(ALLOC_FAILURE_MSG, __func__); |