target: Drop se_subsystem_api->[write_cache,fua_write]_emulated flags

This patch drops se_subsystem_api->[write_cache,fua_write]_emulated flags
set by viritual FILEIO/IBLOCK/RD_MCP backend drivers in favor of explict
TRANSPORT_PLUGIN_PHBA_PDEV checks to know when to fail if userspace is
attempting to set virtual emulation bits for an pSCSI (passthrough)
backend device.

Reported-by: Christoph Hellwig <hch@lst.de>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

4 files changed, 6 insertions, 9 deletions

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 2d0353355ebd..8d774da16320 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -988,8 +988,9 @@ int se_dev_set_emulate_fua_write(struct se_device *dev, int flag)
                 return -EINVAL;
         }
 
-        if (flag && dev->transport->fua_write_emulated == 0) {
-                pr_err("fua_write_emulated not supported\n");
+        if (flag &&
+            dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                pr_err("emulate_fua_write not supported for pSCSI\n");
                 return -EINVAL;
         }
         dev->se_sub_dev->se_dev_attrib.emulate_fua_write = flag;
@@ -1019,8 +1020,9 @@ int se_dev_set_emulate_write_cache(struct se_device *dev, int flag)
                 pr_err("Illegal value %d\n", flag);
                 return -EINVAL;
         }
-        if (flag && dev->transport->write_cache_emulated == 0) {
-                pr_err("write_cache_emulated not supported\n");
+        if (flag &&
+            dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV) {
+                pr_err("emulate_write_cache not supported for pSCSI\n");
                 return -EINVAL;
         }
         dev->se_sub_dev->se_dev_attrib.emulate_write_cache = flag;
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index cbb5aaf3e567..11119257e514 100644
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -546,8 +546,6 @@ static struct se_subsystem_api fileio_template = {
         .name                   = "fileio",
         .owner                  = THIS_MODULE,
         .transport_type         = TRANSPORT_PLUGIN_VHBA_PDEV,
-        .write_cache_emulated   = 1,
-        .fua_write_emulated     = 1,
         .attach_hba             = fd_attach_hba,
         .detach_hba             = fd_detach_hba,
         .allocate_virtdevice    = fd_allocate_virtdevice,
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 0f6ece80bffe..5b745bb56a68 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -766,8 +766,6 @@ static struct se_subsystem_api iblock_template = {
         .name                   = "iblock",
         .owner                  = THIS_MODULE,
         .transport_type         = TRANSPORT_PLUGIN_VHBA_PDEV,
-        .write_cache_emulated   = 1,
-        .fua_write_emulated     = 1,
         .attach_hba             = iblock_attach_hba,
         .detach_hba             = iblock_detach_hba,
         .allocate_virtdevice    = iblock_allocate_virtdevice,
diff --git a/drivers/target/target_core_rd.c b/drivers/target/target_core_rd.c
index 58bcc870366f..d00bbe33ff8b 100644
--- a/drivers/target/target_core_rd.c
+++ b/drivers/target/target_core_rd.c
@@ -474,7 +474,6 @@ static int rd_parse_cdb(struct se_cmd *cmd)
 static struct se_subsystem_api rd_mcp_template = {
         .name                   = "rd_mcp",
         .transport_type         = TRANSPORT_PLUGIN_VHBA_VDEV,
-        .write_cache_emulated   = 1,
         .attach_hba             = rd_attach_hba,
         .detach_hba             = rd_detach_hba,
         .allocate_virtdevice    = rd_allocate_virtdevice,