]> git.karo-electronics.de Git - linux-beck.git/commitdiff
scsi: avoid unnecessary GFP_ATOMIC allocation in scsi_report_lun_scan
authorRob Evers <revers@redhat.com>
Tue, 16 Dec 2014 16:01:18 +0000 (11:01 -0500)
committerChristoph Hellwig <hch@lst.de>
Fri, 9 Jan 2015 14:44:15 +0000 (15:44 +0100)
Signed-off-by: Rob Evers <revers@redhat.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/scsi/scsi_scan.c

index 983aed10ff2f8d97c9d34254768ecd3ec819ab9b..9edae2f3e8791735f5d20896cd647242fca2a171 100644 (file)
@@ -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__);