[1/2] tcmu: revert features patch

Commit Message

Mike Christie July 10, 2017, 7:53 p.m. UTC

This patch reverts:

commit 76b51a2692c8c8a62dbb0fd86df3942102493396
Author: Mike Christie <[e-mail]>
Date:   Sat Jul 8 02:52:34 2017 -0500

    tcmu: export supported device features in configfs

It will be replaced with a file per feature.

Signed-off-by: Mike Christie <[e-mail]>
---
 drivers/target/target_core_user.c     | 13 -------------
 include/uapi/linux/target_core_user.h |  3 ---
 2 files changed, 16 deletions(-)

Patch

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index b891824..2f1fa92 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -111,7 +111,6 @@  struct tcmu_dev {
 
 	char *name;
 	struct se_hba *hba;
-	uint64_t features;
 
 #define TCMU_DEV_BIT_OPEN 0
 #define TCMU_DEV_BIT_BROKEN 1
@@ -1105,7 +1104,6 @@  static struct se_device *tcmu_alloc_device(struct se_hba *hba, const char *name)
 
 	udev->hba = hba;
 	udev->cmd_time_out = TCMU_TIME_OUT;
-	udev->features |= (TCMU_KERN_ALUA | TCMU_KERN_PGR);
 
 	init_waitqueue_head(&udev->wait_cmdr);
 	mutex_init(&udev->cmdr_lock);
@@ -1884,22 +1882,11 @@  static ssize_t tcmu_emulate_write_cache_store(struct config_item *item,
 }
 CONFIGFS_ATTR(tcmu_, emulate_write_cache);
 
-static ssize_t tcmu_features_show(struct config_item *item, char *page)
-{
-	struct se_dev_attrib *da = container_of(to_config_group(item),
-						struct se_dev_attrib, da_group);
-	struct tcmu_dev *udev = TCMU_DEV(da->da_dev);
-
-	return snprintf(page, PAGE_SIZE, "0x%llx\n", udev->features);
-}
-CONFIGFS_ATTR_RO(tcmu_, features);
-
 static struct configfs_attribute *tcmu_attrib_attrs[] = {
 	&tcmu_attr_cmd_time_out,
 	&tcmu_attr_dev_config,
 	&tcmu_attr_dev_size,
 	&tcmu_attr_emulate_write_cache,
-	&tcmu_attr_features,
 	NULL,
 };
 
diff --git a/include/uapi/linux/target_core_user.h b/include/uapi/linux/target_core_user.h
index 03de6e9..24a1c4e 100644
--- a/include/uapi/linux/target_core_user.h
+++ b/include/uapi/linux/target_core_user.h
@@ -154,7 +154,4 @@  enum tcmu_genl_attr {
 };
 #define TCMU_ATTR_MAX (__TCMU_ATTR_MAX - 1)
 
-#define TCMU_KERN_ALUA  (1ULL << 0)
-#define TCMU_KERN_PGR   (1ULL << 1)
-
 #endif