mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 21:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR: Compute scope field correctly

Browse Source 
Signed-off-by: Bart Van Assche <bvanassche@acm.org>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4643 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2012-12-13 21:08:29 +00:00
parent c7c0672b51
commit df9b760738
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_pres.c
+4 -4
View File
@@ -1811,7 +1811,7 @@ void scst_pr_reserve(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
TRACE_ENTRY();
key = get_unaligned((__be64 *)&buffer[0]);
scope = (cmd->cdb[2] & 0x0f) >> 4;
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
if (buffer_size != 24) {
@@ -1828,7 +1828,7 @@ void scst_pr_reserve(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
goto out;
}
if (((cmd->cdb[2] & 0x0f) >> 4) != SCOPE_LU) {
if (scope != SCOPE_LU) {
TRACE_PR("Invalid reservation scope %d", scope);
scst_set_invalid_field_in_cdb(cmd, 2,
SCST_INVAL_FIELD_BIT_OFFS_VALID | 4);
@@ -1897,7 +1897,7 @@ void scst_pr_release(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
TRACE_ENTRY();
key = get_unaligned((__be64 *)&buffer[0]);
scope = (cmd->cdb[2] & 0x0f) >> 4;
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
if (buffer_size != 24) {
@@ -2033,7 +2033,7 @@ static void scst_pr_do_preempt(struct scst_cmd *cmd, uint8_t *buffer,
key = get_unaligned((__be64 *)&buffer[0]);
action_key = get_unaligned((__be64 *)&buffer[8]);
scope = (cmd->cdb[2] & 0x0f) >> 4;
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
if (!scst_pr_type_valid(type)) {
scst/src/scst_targ.c
+1 -1
View File
@@ -2274,7 +2274,7 @@ static int scst_persistent_reserve_out_local(struct scst_cmd *cmd)
/* Check scope */
if ((action != PR_REGISTER) && (action != PR_REGISTER_AND_IGNORE) &&
(action != PR_CLEAR) && ((cmd->cdb[2] & 0x0f) >> 4) != SCOPE_LU) {
(action != PR_CLEAR) && (cmd->cdb[2] >> 4) != SCOPE_LU) {
TRACE_PR("Scope must be SCOPE_LU for action %x", action);
scst_set_cmd_error(cmd,
SCST_LOAD_SENSE(scst_sense_invalid_field_in_cdb));