projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpuidle' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
target
/
target_core_device.c
diff --git
a/drivers/target/target_core_device.c
b/drivers/target/target_core_device.c
index 8032917b663671b058eaa1e05c4eac62d307f667..2be407e22eb499902bd2320e976b0c178fe4bfd3 100644
(file)
--- 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);
dev->export_count--;
spin_unlock(&hba->device_lock);
+ lun->lun_sep = NULL;
lun->lun_se_dev = 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..
*/
* 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;
}
return 0;
}