| Message ID | alpine.LRH.2.02.1511110707130.13128@file01.intranet.prod.int.rdu2.redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Index: linux-4.1.13/drivers/target/target_core_pr.c =================================================================== --- linux-4.1.13.orig/drivers/target/target_core_pr.c 2015-10-23 18:25:26.000000000 +0200 +++ linux-4.1.13/drivers/target/target_core_pr.c 2015-11-10 19:22:07.000000000 +0100 @@ -329,7 +329,7 @@ static int core_scsi3_pr_seq_non_holder( * RESERVATION CONFLICT on some CDBs */ if (!se_sess->se_node_acl->device_list) - return; + return -EINVAL; se_deve = se_sess->se_node_acl->device_list[cmd->orig_fe_lun]; /*
Fix the warning drivers/target/target_core_pr.c:332:3: warning: 'return' with no value, in function returning non-void [-Wreturn-type] The patch 35afa65642a9a88c81913377b93a3a66220f8b9d committed to 4.1.11 adds a check if device_list is NULL. The patch adds a return statement without a value to the function core_scsi3_pr_seq_non_holder that returns int. This patch has no upstream equivalent because the patch 35afa656 that introduced this bug has also no upstream equivalent. The code in upstream was already refactored, so neither 35afa656 nor this patch is needed there. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> --- drivers/target/target_core_pr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) k -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html