aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-04-24 03:04:53 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-05-20 13:53:27 -0400
commitbeb6617d994161a6b12c5f69afc6fb154f085447 (patch)
tree82a1f0ed33648566bc7aeac3ecb2b458b4f48c0a
parent2e759cd4fa60c6df4cb117848274f444c2c0a12d (diff)
[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>
-rw-r--r--drivers/scsi/scsi_lib.c4
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)
941 * if sg table allocation fails, requeue request later. 941 * if sg table allocation fails, requeue request later.
942 */ 942 */
943 sgpnt = scsi_alloc_sgtable(cmd, GFP_ATOMIC); 943 sgpnt = scsi_alloc_sgtable(cmd, GFP_ATOMIC);
944 if (unlikely(!sgpnt)) { 944 if (unlikely(!sgpnt))
945 req->flags |= REQ_SPECIAL;
946 return BLKPREP_DEFER; 945 return BLKPREP_DEFER;
947 }
948 946
949 cmd->request_buffer = (char *) sgpnt; 947 cmd->request_buffer = (char *) sgpnt;
950 cmd->request_bufflen = req->nr_sectors << 9; 948 cmd->request_bufflen = req->nr_sectors << 9;