[PATCH 06/19] s390/dasd: Use GFP_KERNEL in dasd_alloc_device()
Stefan Haberland <[email protected]>
| Newsgroups | org.kernel.vger.linux-s390,org.kernel.vger.linux-block |
|---|---|
| Message-ID | <[email protected]> |
dasd_alloc_device() runs in process context (device set_online), so its pool allocations do not need GFP_ATOMIC. Use GFP_KERNEL instead, which is more reliable, especially for the larger DMA allocations that later ESE full-track work adds here. No functional change intended. Reviewed-by: Jan Höppner <[email protected]> Signed-off-by: Stefan Haberland <[email protected]> --- drivers/s390/block/dasd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 34b563917098..12fa04537fb0 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c @@ -87,25 +87,25 @@ struct dasd_device *dasd_alloc_device(void) { struct dasd_device *device; - device = kzalloc_obj(struct dasd_device, GFP_ATOMIC); + device = kzalloc_obj(struct dasd_device, GFP_KERNEL); if (!device) return ERR_PTR(-ENOMEM); /* Get two pages for normal block device operations. */ - device->ccw_mem = (void *) __get_free_pages(GFP_ATOMIC | GFP_DMA, 1); + device->ccw_mem = (void *)__get_free_pages(GFP_KERNEL | GFP_DMA, 1); if (!device->ccw_mem) { kfree(device); return ERR_PTR(-ENOMEM); } /* Get one page for error recovery. */ - device->erp_mem = (void *) get_zeroed_page(GFP_ATOMIC | GFP_DMA); + device->erp_mem = (void *)get_zeroed_page(GFP_KERNEL | GFP_DMA); if (!device->erp_mem) { free_pages((unsigned long) device->ccw_mem, 1); kfree(device); return ERR_PTR(-ENOMEM); } /* Get two pages for ese format. */ - device->ese_mem = (void *)__get_free_pages(GFP_ATOMIC | GFP_DMA, 1); + device->ese_mem = (void *)__get_free_pages(GFP_KERNEL | GFP_DMA, 1); if (!device->ese_mem) { free_page((unsigned long) device->erp_mem); free_pages((unsigned long) device->ccw_mem, 1); -- 2.53.0