Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d35212f3 authored by Roland Dreier's avatar Roland Dreier Committed by Nicholas Bellinger
Browse files

target: Clean up returning errors in PR handling code 



 - instead of (PTR_ERR(file) < 0) just use IS_ERR(file)
 - return -EINVAL instead of EINVAL
 - all other error returns in target_scsi3_emulate_pr_out() use
   "goto out" -- get rid of the one remaining straight "return."

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 3cc5d2a6

drivers/target/target_core_pr.c

+4 −3
Original line number Diff line number Diff line
@@ -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) {