tcm_loop: remove struct tcm_loop_nacl

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

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index b863ce894977b6684ea065c85c8088cadc06e9e6..e11bcf3e0889907f801d8a04a2a09c3a500cc75e 100644 (file)
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -706,25 +706,14 @@ static int tcm_loop_check_prot_fabric_only(struct se_portal_group *se_tpg)
 static struct se_node_acl *tcm_loop_tpg_alloc_fabric_acl(
        struct se_portal_group *se_tpg)
 {
-       struct tcm_loop_nacl *tl_nacl;
-
-       tl_nacl = kzalloc(sizeof(struct tcm_loop_nacl), GFP_KERNEL);
-       if (!tl_nacl) {
-               pr_err("Unable to allocate struct tcm_loop_nacl\n");
-               return NULL;
-       }
-
-       return &tl_nacl->se_node_acl;
+       return kzalloc(sizeof(struct se_node_acl), GFP_KERNEL);
 }
 
 static void tcm_loop_tpg_release_fabric_acl(
        struct se_portal_group *se_tpg,
        struct se_node_acl *se_nacl)
 {
-       struct tcm_loop_nacl *tl_nacl = container_of(se_nacl,
-                               struct tcm_loop_nacl, se_node_acl);
-
-       kfree(tl_nacl);
+       kfree(se_nacl);
 }
 
 static u32 tcm_loop_get_inst_index(struct se_portal_group *se_tpg)

diff --git a/drivers/target/loopback/tcm_loop.h b/drivers/target/loopback/tcm_loop.h
index 433e595e5daad7bc8ccc5ba56d24858a29f6dc28..4346462094a1af4e4ce778abd41a0f1da1d0a559 100644 (file)
--- a/drivers/target/loopback/tcm_loop.h
+++ b/drivers/target/loopback/tcm_loop.h
@@ -28,10 +28,6 @@ struct tcm_loop_nexus {
        struct se_session *se_sess;
 };
 
-struct tcm_loop_nacl {
-       struct se_node_acl se_node_acl;
-};
-
 #define TCM_TRANSPORT_ONLINE 0
 #define TCM_TRANSPORT_OFFLINE 1