UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

uas: zap_pending: data urbs should have completed at this time 

The data urbs are all killed before calling zap_pending, and their completion
handler should have cleared their inflight flag.

Do not 0 the data inflight flags, and add a check for try_complete succeeding,
as it should always succeed when called from zap_pending.

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:37 +02:00 committed by Greg Kroah-Hartman
parent 1589349f74
commit 9c15c5738b
1 changed files with 5 additions and 5 deletions
drivers/usb/storage
uas.c

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

@ -145,6 +145,7 @@ static void uas_zap_pending(struct uas_dev_info *devinfo, int result)
struct uas_cmd_info *cmdinfo; struct uas_cmd_info *cmdinfo;
struct uas_cmd_info *temp; struct uas_cmd_info *temp;
unsigned long flags; unsigned long flags;
int err;
spin_lock_irqsave(&devinfo->lock, flags); spin_lock_irqsave(&devinfo->lock, flags);
list_for_each_entry_safe(cmdinfo, temp, &devinfo->dead_list, list) { list_for_each_entry_safe(cmdinfo, temp, &devinfo->dead_list, list) {
@ -152,12 +153,11 @@ static void uas_zap_pending(struct uas_dev_info *devinfo, int result)
struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd,
SCp); SCp);
uas_log_cmd_state(cmnd, __func__); uas_log_cmd_state(cmnd, __func__);
/* all urbs are killed, clear inflight bits */ /* Sense urbs were killed, clear COMMAND_INFLIGHT manually */
cmdinfo->state &= ~(COMMAND_INFLIGHT | cmdinfo->state &= ~COMMAND_INFLIGHT;
DATA_IN_URB_INFLIGHT |
DATA_OUT_URB_INFLIGHT);
cmnd->result = result << 16; cmnd->result = result << 16;
uas_try_complete(cmnd, __func__); err = uas_try_complete(cmnd, __func__);
WARN_ON(err != 0);
} }
spin_unlock_irqrestore(&devinfo->lock, flags); spin_unlock_irqrestore(&devinfo->lock, flags);
} }