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

[mirror_ubuntu-artful-kernel.git] / drivers / target / loopback / tcm_loop.c

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 1f4c015e90786937423e7c86bd3638c013f6dacd..6d2f37578b29cc0509d3898b7910bb35cd9d484c 100644 (file)
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -960,7 +960,7 @@ static int tcm_loop_port_link(
        struct tcm_loop_hba *tl_hba = tl_tpg->tl_hba;
 
        atomic_inc(&tl_tpg->tl_tpg_port_count);
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
        /*
         * Add Linux/SCSI struct scsi_device by HCTL
         */
@@ -995,7 +995,7 @@ static void tcm_loop_port_unlink(
        scsi_device_put(sd);
 
        atomic_dec(&tl_tpg->tl_tpg_port_count);
-       smp_mb__after_atomic_dec();
+       smp_mb__after_atomic();
 
        pr_debug("TCM_Loop_ConfigFS: Port Unlink Successful\n");
 }