Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit beb6617d994161a6b12c5f69afc6fb154f085447

Authored by Tejun Heo
Committed by James Bottomley
1 parent 2e759cd4fa

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

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

drivers/scsi/scsi_lib.c
Diff comments   View file @ beb6617
... ... @@ -941,10 +941,8 @@
941 941 * if sg table allocation fails, requeue request later.
942 942 */
943 943 sgpnt = scsi_alloc_sgtable(cmd, GFP_ATOMIC);
944   - if (unlikely(!sgpnt)) {
945   - req->flags |= REQ_SPECIAL;
  944 + if (unlikely(!sgpnt))
946 945 return BLKPREP_DEFER;
947   - }
948 946  
949 947 cmd->request_buffer = (char *) sgpnt;
950 948 cmd->request_bufflen = req->nr_sectors << 9;