Commit bdb90726 authored by Changpeng Liu's avatar Changpeng Liu Committed by Darek Stojaczyk
Browse files

scsi: fix error break when checking SCSI reservation 



We should return for the registrant case when the reservation holder
exists.

Change-Id: Ie3cf31554eafdad03294aef2eeb6eaef1536b8c3
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/460305


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarLiang Yan <liang.z.yan@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent c47d6541

lib/scsi/scsi_pr.c

+2 −2
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ spdk_scsi_pr_check(struct spdk_scsi_task *task) 
				      "is not registered, cdb 0x%x\n", cdb[0]);

			goto conflict;

		}

		break;

		return 0;

	case SPDK_SPC_PERSISTENT_RESERVE_OUT:

		action = cdb[1] & 0x1f;

		SPDK_DEBUGLOG(SPDK_LOG_SCSI, "CHECK: PR OUT action %u\n", action);
@@ -802,7 +802,7 @@ spdk_scsi_pr_check(struct spdk_scsi_task *task) 
				SPDK_ERRLOG("CHECK: PR OUT action %u\n", action);

				goto conflict;

			}

			break;

			return 0;

		case SPDK_SCSI_PR_OUT_REGISTER:

		case SPDK_SCSI_PR_OUT_REG_AND_IGNORE_KEY:

			return 0;