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

Commit e7eda932 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

uas: fix GFP_NOIO under spinlock 



Quote Dan:

The patch e36e6493: "uas: Use GFP_NOIO rather then GFP_ATOMIC
where possible" from Nov 7, 2013, leads to the following static
checker warning:

        drivers/usb/storage/uas.c:806 uas_eh_task_mgmt()
        error: scheduling with locks held: 'spin_lock:lock'

Some other allocations under spinlock are not caught.
The fix essentially reverts e36e6493

Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7a87195

drivers/usb/storage/uas.c

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void uas_do_work(struct work_struct *work) 
		if (!(cmdinfo->state & IS_IN_WORK_LIST))

			continue;



		err = uas_submit_urbs(cmnd, cmnd->device->hostdata, GFP_NOIO);

		err = uas_submit_urbs(cmnd, cmnd->device->hostdata, GFP_ATOMIC);

		if (!err)

			cmdinfo->state &= ~IS_IN_WORK_LIST;

		else
@@ -803,7 +803,7 @@ static int uas_eh_task_mgmt(struct scsi_cmnd *cmnd, 


	devinfo->running_task = 1;

	memset(&devinfo->response, 0, sizeof(devinfo->response));

	sense_urb = uas_submit_sense_urb(cmnd, GFP_NOIO,

	sense_urb = uas_submit_sense_urb(cmnd, GFP_ATOMIC,

					 devinfo->use_streams ? tag : 0);

	if (!sense_urb) {

		shost_printk(KERN_INFO, shost,
@@ -813,7 +813,7 @@ static int uas_eh_task_mgmt(struct scsi_cmnd *cmnd, 
		spin_unlock_irqrestore(&devinfo->lock, flags);

		return FAILED;

	}

	if (uas_submit_task_urb(cmnd, GFP_NOIO, function, tag)) {

	if (uas_submit_task_urb(cmnd, GFP_ATOMIC, function, tag)) {

		shost_printk(KERN_INFO, shost,

			     "%s: %s: submit task mgmt urb failed\n",

			     __func__, fname);