Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-microblaze.git] / drivers / target / target_core_fabric_configfs.c

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 31a096a..d8a16ca 100644 (file)
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -137,7 +137,7 @@ static int target_fabric_mappedlun_link(
        return core_dev_add_initiator_node_lun_acl(se_tpg, lacl, lun, lun_access_ro);
 }
 
-static int target_fabric_mappedlun_unlink(
+static void target_fabric_mappedlun_unlink(
        struct config_item *lun_acl_ci,
        struct config_item *lun_ci)
 {
@@ -146,7 +146,7 @@ static int target_fabric_mappedlun_unlink(
        struct se_lun *lun = container_of(to_config_group(lun_ci),
                        struct se_lun, lun_group);
 
-       return core_dev_del_initiator_node_lun_acl(lun, lacl);
+       core_dev_del_initiator_node_lun_acl(lun, lacl);
 }
 
 static struct se_lun_acl *item_to_lun_acl(struct config_item *item)
@@ -669,7 +669,7 @@ out:
        return ret;
 }
 
-static int target_fabric_port_unlink(
+static void target_fabric_port_unlink(
        struct config_item *lun_ci,
        struct config_item *se_dev_ci)
 {
@@ -688,7 +688,6 @@ static int target_fabric_port_unlink(
        }
 
        core_dev_del_lun(se_tpg, lun);
-       return 0;
 }
 
 static void target_fabric_port_release(struct config_item *item)