From: Rob Evers <revers@redhat.com>
Date: Tue, 16 Dec 2014 16:01:18 +0000 (-0500)
Subject: scsi: avoid unnecessary GFP_ATOMIC allocation in scsi_report_lun_scan
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=eb9eea01d4d8ce86eeee52cdd40029fd1a549721;p=deliverable%2Flinux.git

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>
---

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__);