p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uas: Free data urbs on completion 

Now that we no longer drop our lock to unlink the data urbs, we can simply
free them on completion, making their handling consistent with the other urbs.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2014-09-13 12:26:35 +02:00 committed by Greg Kroah-Hartman
parent 60d9f67d47
commit 85fea82554
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/usb/storage/uas.c
View File

@ -288,8 +288,6 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)
return -EBUSY; return -EBUSY;
WARN_ON_ONCE(cmdinfo->state & COMMAND_COMPLETED); WARN_ON_ONCE(cmdinfo->state & COMMAND_COMPLETED);
cmdinfo->state |= COMMAND_COMPLETED; cmdinfo->state |= COMMAND_COMPLETED;
usb_free_urb(cmdinfo->data_in_urb);
usb_free_urb(cmdinfo->data_out_urb);
if (cmdinfo->state & COMMAND_ABORTED) if (cmdinfo->state & COMMAND_ABORTED)
scmd_printk(KERN_INFO, cmnd, "abort completed\n"); scmd_printk(KERN_INFO, cmnd, "abort completed\n");
list_del(&cmdinfo->list); list_del(&cmdinfo->list);
@ -418,9 +416,11 @@ static void uas_data_cmplt(struct urb *urb)
if (cmdinfo->data_in_urb == urb) { if (cmdinfo->data_in_urb == urb) {
sdb = scsi_in(cmnd); sdb = scsi_in(cmnd);
cmdinfo->state &= ~DATA_IN_URB_INFLIGHT; cmdinfo->state &= ~DATA_IN_URB_INFLIGHT;
cmdinfo->data_in_urb = NULL;
} else if (cmdinfo->data_out_urb == urb) { } else if (cmdinfo->data_out_urb == urb) {
sdb = scsi_out(cmnd); sdb = scsi_out(cmnd);
cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT; cmdinfo->state &= ~DATA_OUT_URB_INFLIGHT;
cmdinfo->data_out_urb = NULL;
} }
if (sdb == NULL) { if (sdb == NULL) {
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
@ -450,6 +450,7 @@ static void uas_data_cmplt(struct urb *urb)
} }
uas_try_complete(cmnd, __func__); uas_try_complete(cmnd, __func__);
out: out:
usb_free_urb(urb);
spin_unlock_irqrestore(&devinfo->lock, flags); spin_unlock_irqrestore(&devinfo->lock, flags);
} }