diff options
| author | Tejun Heo <htejun@gmail.com> | 2005-04-24 02:04:53 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 12:53:27 -0500 |
| commit | beb6617d994161a6b12c5f69afc6fb154f085447 (patch) | |
| tree | 82a1f0ed33648566bc7aeac3ecb2b458b4f48c0a /drivers/scsi | |
| parent | 2e759cd4fa60c6df4cb117848274f444c2c0a12d (diff) | |
| download | linux-stable-beb6617d994161a6b12c5f69afc6fb154f085447.tar.gz linux-stable-beb6617d994161a6b12c5f69afc6fb154f085447.tar.bz2 linux-stable-beb6617d994161a6b12c5f69afc6fb154f085447.zip | |
[SCSI] remove REQ_SPECIAL in scsi_init_io()
scsi_init_io() used to set REQ_SPECIAL when it fails sg
allocation before requeueing the request by returning
BLKPREP_DEFER. REQ_SPECIAL is being updated to mean special
requests. So, remove REQ_SPECIAL setting.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index d18da21c9c57..861d5f5c9722 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -941,10 +941,8 @@ static int scsi_init_io(struct scsi_cmnd *cmd) * if sg table allocation fails, requeue request later. */ sgpnt = scsi_alloc_sgtable(cmd, GFP_ATOMIC); - if (unlikely(!sgpnt)) { - req->flags |= REQ_SPECIAL; + if (unlikely(!sgpnt)) return BLKPREP_DEFER; - } cmd->request_buffer = (char *) sgpnt; cmd->request_bufflen = req->nr_sectors << 9; |