[Devel] [PATCH RHEL7 COMMIT] target: rename user_helper back to alua_user_helper

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-862.6.3.vz7.62.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-862.6.3.vz7.62.4
------>
commit c7326404fa9f9eb1211304c80051dc8514063330
Author: Andrei Vagin <avagin at openvz.org>
Date:   Thu Jul 19 13:15:01 2018 +0300

    target: rename user_helper back to alua_user_helper
    
    After the last rebase, alua_user_helper was renamed into user_helper by
    mistake.
    
    https://pmc.acronis.com/browse/VSTOR-12238
    
    Signed-off-by: Andrei Vagin <avagin at openvz.org>
---
 drivers/target/target_core_configfs.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
index a5a66ce16c39..101f668bf2e2 100644
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@ -1946,14 +1946,14 @@ static ssize_t target_dev_enable_store(struct config_item *item,
 	return count;
 }
 
-static ssize_t target_dev_user_helper_show(struct config_item *item, char *page)
+static ssize_t target_dev_alua_user_helper_show(struct config_item *item, char *page)
 {
 	struct se_device *dev = to_device(item);
 
 	return core_alua_show_user_helper(dev, page);
 }
 
-static ssize_t target_dev_user_helper_store(struct config_item *item,
+static ssize_t target_dev_alua_user_helper_store(struct config_item *item,
 		const char *page, size_t count)
 {
 	struct se_device *dev = to_device(item);
@@ -2232,7 +2232,7 @@ CONFIGFS_ATTR(target_dev_, udev_path);
 CONFIGFS_ATTR(target_dev_, enable);
 CONFIGFS_ATTR(target_dev_, alua_lu_gp);
 CONFIGFS_ATTR(target_dev_, lba_map);
-CONFIGFS_ATTR(target_dev_, user_helper);
+CONFIGFS_ATTR(target_dev_, alua_user_helper);
 
 static struct configfs_attribute *target_core_dev_attrs[] = {
 	&target_dev_attr_info,
@@ -2242,7 +2242,7 @@ static struct configfs_attribute *target_core_dev_attrs[] = {
 	&target_dev_attr_enable,
 	&target_dev_attr_alua_lu_gp,
 	&target_dev_attr_lba_map,
-	&target_dev_attr_user_helper,
+	&target_dev_attr_alua_user_helper,
 	NULL,
 };