aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/sg.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index d18f90d1d9ad..2c30331abbed 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -68,7 +68,6 @@ static void sg_proc_cleanup(void);
68#endif 68#endif
69 69
70#define SG_ALLOW_DIO_DEF 0 70#define SG_ALLOW_DIO_DEF 0
71#define SG_ALLOW_DIO_CODE /* compile out by commenting this define */
72 71
73#define SG_MAX_DEVS 32768 72#define SG_MAX_DEVS 32768
74 73
@@ -1674,13 +1673,12 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
1674 if ((dxfer_len <= 0) || (dxfer_dir == SG_DXFER_NONE)) 1673 if ((dxfer_len <= 0) || (dxfer_dir == SG_DXFER_NONE))
1675 return 0; 1674 return 0;
1676 1675
1677#ifdef SG_ALLOW_DIO_CODE
1678 if (sg_allow_dio && (hp->flags & SG_FLAG_DIRECT_IO) && 1676 if (sg_allow_dio && (hp->flags & SG_FLAG_DIRECT_IO) &&
1679 (dxfer_dir != SG_DXFER_UNKNOWN) && (0 == hp->iovec_count) && 1677 (dxfer_dir != SG_DXFER_UNKNOWN) && (0 == hp->iovec_count) &&
1680 (!sfp->parentdp->device->host->unchecked_isa_dma) && 1678 (!sfp->parentdp->device->host->unchecked_isa_dma) &&
1681 blk_rq_aligned(q, hp->dxferp, dxfer_len)) 1679 blk_rq_aligned(q, hp->dxferp, dxfer_len))
1682 return sg_build_direct(srp, sfp, dxfer_len); 1680 return sg_build_direct(srp, sfp, dxfer_len);
1683#endif 1681
1684 if ((!sg_res_in_use(sfp)) && (dxfer_len <= rsv_schp->bufflen)) 1682 if ((!sg_res_in_use(sfp)) && (dxfer_len <= rsv_schp->bufflen))
1685 sg_link_reserve(sfp, srp, dxfer_len); 1683 sg_link_reserve(sfp, srp, dxfer_len);
1686 else 1684 else