Commit fecac0d8 authored by Changpeng Liu's avatar Changpeng Liu Committed by Jim Harris
Browse files

scsi: fix SCSI reservation typos 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 804ca3e9

include/spdk/scsi_spec.h

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ enum spdk_scsi_pr_type_code { 
struct spdk_scsi_pr_in_read_header {

	/* persistent reservation generation */

	uint32_t pr_generation;

	uint32_t addiontal_len;

	uint32_t additional_len;

};

SPDK_STATIC_ASSERT(sizeof(struct spdk_scsi_pr_in_read_header) == 8, "Incorrect size");

lib/scsi/scsi_pr.c

+3 −3
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ spdk_scsi_pr_in_read_keys(struct spdk_scsi_task *task, uint8_t *data, 
		to_be64(&keys->rkeys[count], reg->rkey);

		count++;

	}

	to_be32(&keys->header.addiontal_len, count * 8);

	to_be32(&keys->header.additional_len, count * 8);



	return (sizeof(keys->header) + count * 8);

}
@@ -605,7 +605,7 @@ spdk_scsi_pr_in_read_reservations(struct spdk_scsi_task *task, 
		} else {

			to_be64(&param->rkey, lun->reservation.crkey);

		}

		to_be32(&param->header.addiontal_len, 16);

		to_be32(&param->header.additional_len, 16);

		param->scope = SPDK_SCSI_PR_LU_SCOPE;

		param->type = lun->reservation.rtype;

		SPDK_DEBUGLOG(SPDK_LOG_SCSI, "READ RESERVATIONS with valid reservation\n");
@@ -613,7 +613,7 @@ spdk_scsi_pr_in_read_reservations(struct spdk_scsi_task *task, 
	}



	/* no reservation */

	to_be32(&param->header.addiontal_len, 0);

	to_be32(&param->header.additional_len, 0);

	SPDK_DEBUGLOG(SPDK_LOG_SCSI, "READ RESERVATIONS no reservation\n");

	return sizeof(param->header);

}