Merge tag 'iio-fixes-for-3.16c' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / target / target_core_device.c

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 26416c1..98da901 100644 (file)
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -225,7 +225,7 @@ struct se_dev_entry *core_get_se_deve_from_rtpi(
                        continue;
 
                atomic_inc(&deve->pr_ref_count);
-               smp_mb__after_atomic_inc();
+               smp_mb__after_atomic();
                spin_unlock_irq(&nacl->device_list_lock);
 
                return deve;
@@ -616,6 +616,7 @@ void core_dev_unexport(
        dev->export_count--;
        spin_unlock(&hba->device_lock);
 
+       lun->lun_sep = NULL;
        lun->lun_se_dev = NULL;
 }
 
@@ -1396,7 +1397,7 @@ int core_dev_add_initiator_node_lun_acl(
        spin_lock(&lun->lun_acl_lock);
        list_add_tail(&lacl->lacl_list, &lun->lun_acl_list);
        atomic_inc(&lun->lun_acl_count);
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
        spin_unlock(&lun->lun_acl_lock);
 
        pr_debug("%s_TPG[%hu]_LUN[%u->%u] - Added %s ACL for "
@@ -1430,7 +1431,7 @@ int core_dev_del_initiator_node_lun_acl(
        spin_lock(&lun->lun_acl_lock);
        list_del(&lacl->lacl_list);
        atomic_dec(&lun->lun_acl_count);
-       smp_mb__after_atomic_dec();
+       smp_mb__after_atomic();
        spin_unlock(&lun->lun_acl_lock);
 
        core_disable_device_list_for_node(lun, NULL, lacl->mapped_lun,