Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d635c25 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

scsi: sr: Don't use GFP_DMA 

[ Upstream commit d94d94969a4ba07a43d62429c60372320519c391 ]

The allocated buffers are used as a command payload, for which the block
layer and/or DMA API do the proper bounce buffering if needed.

Link: https://lore.kernel.org/r/20211222090842.920724-1-hch@lst.de


Reported-by: default avatarBaoquan He <bhe@redhat.com>
Reviewed-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1785538d

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ static void get_capabilities(struct scsi_cd *cd) 




	/* allocate transfer buffer */

	buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);

	buffer = kmalloc(512, GFP_KERNEL);

	if (!buffer) {

		sr_printk(KERN_ERR, cd, "out of memory.\n");

		return;

drivers/scsi/sr_vendor.c

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ int sr_set_blocklength(Scsi_CD *cd, int blocklength) 
	if (cd->vendor == VENDOR_TOSHIBA)

		density = (blocklength > 2048) ? 0x81 : 0x83;



	buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);

	buffer = kmalloc(512, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;
@@ -161,7 +161,7 @@ int sr_cd_check(struct cdrom_device_info *cdi) 
	if (cd->cdi.mask & CDC_MULTI_SESSION)

		return 0;



	buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);

	buffer = kmalloc(512, GFP_KERNEL);

	if (!buffer)

		return -ENOMEM;