From 0eee159ad024753b10fd4a179e2c18e08e524d05 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 2 Apr 2006 18:51:53 +0900 Subject: [PATCH] --- yaml --- r: 29231 b: refs/heads/master c: 2719736779da2c7fbb17d3de16c817b429bfeb9c h: refs/heads/master i: 29229: 985dccf5c6f9e8c6378c08b30c5354811226e1e7 29227: e525b5f8c70a316ff7122351cf911232fbab0e09 29223: 9b28244a504fa03c59a9d1fe77ab75d3ebae55ea 29215: eeb6a0b9e1f532d03c0590e0b5debae2589a7e23 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-scsi.c | 1 + trunk/include/linux/libata.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 76b5890c56af..f7047f1dbbdc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8384607d4f395985e3cc5f82d75fc73efc2ecf0 +refs/heads/master: 2719736779da2c7fbb17d3de16c817b429bfeb9c diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c index 096bdffbde11..234e1cadb070 100644 --- a/trunk/drivers/scsi/libata-scsi.c +++ b/trunk/drivers/scsi/libata-scsi.c @@ -1188,6 +1188,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm u64 block; u32 n_block; + qc->flags |= ATA_QCFLAG_IO; tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE; if (scsicmd[0] == WRITE_10 || scsicmd[0] == WRITE_6 || diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index cbbc821fe22c..a6d829cb0567 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -161,7 +161,8 @@ enum { ATA_QCFLAG_SG = (1 << 1), /* have s/g table? */ ATA_QCFLAG_SINGLE = (1 << 2), /* no s/g, just a single buffer */ ATA_QCFLAG_DMAMAP = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE, - ATA_QCFLAG_EH_SCHEDULED = (1 << 3), /* EH scheduled */ + ATA_QCFLAG_IO = (1 << 3), /* standard IO command */ + ATA_QCFLAG_EH_SCHEDULED = (1 << 4), /* EH scheduled */ /* host set flags */ ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host_set only */