Hi,
On 03/28/2014 11:10 AM, oliver@xxxxxxxxxx wrote:
> From: Oliver Neukum <oneukum@xxxxxxx>
>
> Quote Dan:
>
> The patch e36e64930cff: "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 e36e64930cffd94e1c37fdb82f35989384aa946b
>
> Signed-off-by: Oliver Neukum <oliver@xxxxxxxxxx>
> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Thanks!
Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Acked-by: Hans de Goede <hdegoede@xxxxxxxxxx>
Regards,
Hans
> ---
> drivers/usb/storage/uas.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
> index a7ac97c..8f42226 100644
> --- a/drivers/usb/storage/uas.c
> +++ b/drivers/usb/storage/uas.c
> @@ -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);
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
