X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Ftarget%2Ftarget_core_device.c;h=2be407e22eb499902bd2320e976b0c178fe4bfd3;hb=cc43a17507644ad34d07a3e95d7376d55fd82b15;hp=8032917b663671b058eaa1e05c4eac62d307f667;hpb=f056113faf553e166cb54bd6d1fe4f4b82c27568;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index 8032917b6636..2be407e22eb4 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -614,6 +614,7 @@ void core_dev_unexport(
 	dev->export_count--;
 	spin_unlock(&hba->device_lock);
 
+	lun->lun_sep = NULL;
 	lun->lun_se_dev = NULL;
 }
 
@@ -1292,7 +1293,8 @@ int core_dev_add_initiator_node_lun_acl(
 	 * Check to see if there are any existing persistent reservation APTPL
 	 * pre-registrations that need to be enabled for this LUN ACL..
 	 */
-	core_scsi3_check_aptpl_registration(lun->lun_se_dev, tpg, lun, lacl);
+	core_scsi3_check_aptpl_registration(lun->lun_se_dev, tpg, lun, nacl,
+					    lacl->mapped_lun);
 	return 0;
 }