summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-02-03 13:07:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-02-03 13:07:56 -0800
commitabbbd0211ddfc6e525b00b3c8c84032f705e4a5d (patch)
tree8ffabd03690e538ee3e4aa501c29691652d903fb /include
parent6cb7903e37ab0513ff38c54c66715b8fff19fab0 (diff)
parent39051dd85f2870624c3fc7a099b11c67fb822aed (diff)
downloadlinux-abbbd0211ddfc6e525b00b3c8c84032f705e4a5d.tar.bz2
Merge tag 'scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull second set of SCSI updates from James Bottomley: "This is a set of three patches that depended on mq and zone changes in the block tree (now upstream)" * tag 'scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: sd: Remove zone write locking scsi: sd_zbc: Initialize device request queue zoned data scsi: scsi-mq-debugfs: Show more information
Diffstat (limited to 'include')
-rw-r--r--include/scsi/scsi_cmnd.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 949a016dd7fa..d8d4a902a88d 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -58,8 +58,7 @@ struct scsi_pointer {
/* for scmd->flags */
#define SCMD_TAGGED (1 << 0)
#define SCMD_UNCHECKED_ISA_DMA (1 << 1)
-#define SCMD_ZONE_WRITE_LOCK (1 << 2)
-#define SCMD_INITIALIZED (1 << 3)
+#define SCMD_INITIALIZED (1 << 2)
/* flags preserved across unprep / reprep */
#define SCMD_PRESERVED_FLAGS (SCMD_UNCHECKED_ISA_DMA | SCMD_INITIALIZED)