diff options
| author | James Bottomley | 2013-05-10 16:53:40 +0200 |
|---|---|---|
| committer | James Bottomley | 2013-05-10 16:53:40 +0200 |
| commit | 832e77bc1106592c621fc42f2f6a4500e414a0a1 (patch) | |
| tree | 2b226019e7b1344f05e44d79da956a5306d20780 /drivers/scsi/sd.h | |
| parent | Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| parent | [SCSI] qla2xxx: Update firmware link in Kconfig file. (diff) | |
| download | kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.gz kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.tar.xz kernel-qcow2-linux-832e77bc1106592c621fc42f2f6a4500e414a0a1.zip | |
Merge branch 'misc' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/sd.h')
| -rw-r--r-- | drivers/scsi/sd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 74a1e4ca5401..2386aeb41fe8 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -73,6 +73,7 @@ struct scsi_disk { u8 protection_type;/* Data Integrity Field */ u8 provisioning_mode; unsigned ATO : 1; /* state of disk ATO bit */ + unsigned cache_override : 1; /* temp override of WCE,RCD */ unsigned WCE : 1; /* state of disk WCE bit */ unsigned RCD : 1; /* state of disk RCD bit, unused */ unsigned DPOFUA : 1; /* state of disk DPOFUA bit */ |