Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[firefly-linux-kernel-4.4.55.git] / drivers / target / tcm_fc / tfc_sess.c

diff --git a/drivers/target/tcm_fc/tfc_sess.c b/drivers/target/tcm_fc/tfc_sess.c
index b30f92bdc1a48202917df46a09a641ef06fddc31..cb99da920068986d2c2153f6af507781561074d5 100644 (file)
--- a/drivers/target/tcm_fc/tfc_sess.c
+++ b/drivers/target/tcm_fc/tfc_sess.c
@@ -85,16 +85,6 @@ static struct ft_tport *ft_tport_create(struct fc_lport *lport)
        return tport;
 }
 
-/*
- * Free tport via RCU.
- */
-static void ft_tport_rcu_free(struct rcu_head *rcu)
-{
-       struct ft_tport *tport = container_of(rcu, struct ft_tport, rcu);
-
-       kfree(tport);
-}
-
 /*
  * Delete a target local port.
  * Caller holds ft_lport_lock.
@@ -114,7 +104,7 @@ static void ft_tport_delete(struct ft_tport *tport)
                tpg->tport = NULL;
                tport->tpg = NULL;
        }
-       call_rcu(&tport->rcu, ft_tport_rcu_free);
+       kfree_rcu(tport, rcu);
 }
 
 /*