diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-20 14:12:51 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-20 14:12:51 -0400 |
| commit | 58aab753de605c14b9878a897e7349c3063afeff (patch) | |
| tree | c9339c8cbcaae4dfe2232618fe6de1398d05455e /drivers/scsi/sg.c | |
| parent | 5893a65711164e42fea4a58bb8adf47c2fac8a4b (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 7936aafc3d05..3d1d7bff38ed 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -2472,6 +2472,8 @@ sg_remove_request(Sg_fd * sfp, Sg_request * srp) | |||
| 2472 | if ((!sfp) || (!srp) || (!sfp->headrp)) | 2472 | if ((!sfp) || (!srp) || (!sfp->headrp)) |
| 2473 | return res; | 2473 | return res; |
| 2474 | write_lock_irqsave(&sfp->rq_list_lock, iflags); | 2474 | write_lock_irqsave(&sfp->rq_list_lock, iflags); |
| 2475 | if (srp->my_cmdp) | ||
| 2476 | srp->my_cmdp->upper_private_data = NULL; | ||
| 2475 | prev_rp = sfp->headrp; | 2477 | prev_rp = sfp->headrp; |
| 2476 | if (srp == prev_rp) { | 2478 | if (srp == prev_rp) { |
| 2477 | sfp->headrp = prev_rp->nextrp; | 2479 | sfp->headrp = prev_rp->nextrp; |