From: Tejun Heo  <htejun@gmail.com>
Date: Sun, 24 Apr 2005 07:04:53 +0000 (-0500)
Subject: [SCSI] remove REQ_SPECIAL in scsi_init_io()
X-Git-Tag: v2.6.13-rc1~90^2~583^2~62^2^2~27^2~39
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb6617d994161a6b12c5f69afc6fb154f085447;p=linux-2.6

[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>
---

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d18da21c9c..861d5f5c97 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;