|
@@ -2031,7 +2031,7 @@ static int __core_scsi3_write_aptpl_to_file(
|
|
|
if (IS_ERR(file) || !file || !file->f_dentry) {
|
|
|
pr_err("filp_open(%s) for APTPL metadata"
|
|
|
" failed\n", path);
|
|
|
- return (PTR_ERR(file) < 0 ? PTR_ERR(file) : -ENOENT);
|
|
|
+ return IS_ERR(file) ? PTR_ERR(file) : -ENOENT;
|
|
|
}
|
|
|
|
|
|
iov[0].iov_base = &buf[0];
|
|
@@ -3818,7 +3818,7 @@ int target_scsi3_emulate_pr_out(struct se_cmd *cmd)
|
|
|
" SPC-2 reservation is held, returning"
|
|
|
" RESERVATION_CONFLICT\n");
|
|
|
cmd->scsi_sense_reason = TCM_RESERVATION_CONFLICT;
|
|
|
- ret = EINVAL;
|
|
|
+ ret = -EINVAL;
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -3828,7 +3828,8 @@ int target_scsi3_emulate_pr_out(struct se_cmd *cmd)
|
|
|
*/
|
|
|
if (!cmd->se_sess) {
|
|
|
cmd->scsi_sense_reason = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
|
|
|
- return -EINVAL;
|
|
|
+ ret = -EINVAL;
|
|
|
+ goto out;
|
|
|
}
|
|
|
|
|
|
if (cmd->data_length < 24) {
|