mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-22 05:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst pr: Use get_unaligned_be64() and put_unaligned_be64()

Browse Source 
Clean up the code for converting to and from the be64 data type as follows:
* Change get_unaligned((__be64 *)p) into get_unaligned_be64(p).
* Change put_unaligned(value, (__be64 *)p) into put_unaligned_be64(value, p).

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



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4678 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2013-01-04 00:10:35 +00:00
parent 8fe7638e44
commit 59affce667
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scst/src/scst_pres.c
View File

@@ -65,7 +65,7 @@
#include "scst_pres.h"
#define SCST_PR_ROOT_ENTRY "pr"
#define SCST_PR_FILE_SIGN 0xBBEEEEAAEEBBDD77LLU
#define SCST_PR_FILE_SIGN 0xBBEEEEAAEEBBDD78LLU
#define SCST_PR_FILE_VERSION 1LLU
#define FILE_BUFFER_SIZE 512
@@ -710,7 +710,7 @@ static int scst_pr_do_load_device_file(struct scst_device *dev,
tid = &buf[pos];
pos += tid_size(tid);
key = get_unaligned((__be64 *)&buf[pos]);
key = get_unaligned_be64(&buf[pos]);
pos += sizeof(key);
rel_tgt_id = get_unaligned((uint16_t *)&buf[pos]);
@@ -1171,7 +1171,7 @@ static int scst_pr_register_with_spec_i_pt(struct scst_cmd *cmd,
struct scst_dev_registrant *reg;
uint8_t *transport_id;
action_key = get_unaligned((__be64 *)&buffer[8]);
action_key = get_unaligned_be64(&buffer[8]);
ext_size = get_unaligned_be32(&buffer[24]);
if ((ext_size + 28) > buffer_size) {
@@ -1376,7 +1376,7 @@ static int scst_pr_register_on_tgt_id(struct scst_cmd *cmd,
__be64 action_key;
struct scst_dev_registrant *reg;
action_key = get_unaligned((__be64 *)&buffer[8]);
action_key = get_unaligned_be64(&buffer[8]);
reg = scst_pr_add_registrant(cmd->dev, cmd->sess->transport_id,
rel_tgt_id, action_key, false);
@@ -1500,8 +1500,8 @@ void scst_pr_register(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
aptpl = buffer[20] & 0x01;
spec_i_pt = (buffer[20] >> 3) & 0x01;
all_tg_pt = (buffer[20] >> 2) & 0x01;
key = get_unaligned((__be64 *)&buffer[0]);
action_key = get_unaligned((__be64 *)&buffer[8]);
key = get_unaligned_be64(&buffer[0]);
action_key = get_unaligned_be64(&buffer[8]);
if (spec_i_pt == 0 && buffer_size != 24) {
TRACE_PR("Invalid buffer size %d", buffer_size);
@@ -1591,7 +1591,7 @@ void scst_pr_register_and_ignore(struct scst_cmd *cmd, uint8_t *buffer,
aptpl = buffer[20] & 0x01;
all_tg_pt = (buffer[20] >> 2) & 0x01;
action_key = get_unaligned((__be64 *)&buffer[8]);
action_key = get_unaligned_be64(&buffer[8]);
if (buffer_size != 24) {
TRACE_PR("Invalid buffer size %d", buffer_size);
@@ -1667,8 +1667,8 @@ void scst_pr_register_and_move(struct scst_cmd *cmd, uint8_t *buffer,
TRACE_ENTRY();
aptpl = buffer[17] & 0x01;
key = get_unaligned((__be64 *)&buffer[0]);
action_key = get_unaligned((__be64 *)&buffer[8]);
key = get_unaligned_be64(&buffer[0]);
action_key = get_unaligned_be64(&buffer[8]);
unreg = (buffer[17] >> 1) & 0x01;
tid_buffer_size = get_unaligned_be32(&buffer[20]);
@@ -1810,7 +1810,7 @@ void scst_pr_reserve(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
TRACE_ENTRY();
key = get_unaligned((__be64 *)&buffer[0]);
key = get_unaligned_be64(&buffer[0]);
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
@@ -1896,7 +1896,7 @@ void scst_pr_release(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
TRACE_ENTRY();
key = get_unaligned((__be64 *)&buffer[0]);
key = get_unaligned_be64(&buffer[0]);
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
@@ -1970,7 +1970,7 @@ void scst_pr_clear(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
TRACE_ENTRY();
key = get_unaligned((__be64 *)&buffer[0]);
key = get_unaligned_be64(&buffer[0]);
if (buffer_size != 24) {
TRACE_PR("Invalid buffer size %d", buffer_size);
@@ -2031,8 +2031,8 @@ static void scst_pr_do_preempt(struct scst_cmd *cmd, uint8_t *buffer,
goto out;
}
key = get_unaligned((__be64 *)&buffer[0]);
action_key = get_unaligned((__be64 *)&buffer[8]);
key = get_unaligned_be64(&buffer[0]);
action_key = get_unaligned_be64(&buffer[8]);
scope = cmd->cdb[2] >> 4;
type = cmd->cdb[2] & 0x0f;
@@ -2416,8 +2416,7 @@ void scst_pr_read_keys(struct scst_cmd *cmd, uint8_t *buffer, int buffer_size)
WARN_ON(reg->key == 0);
put_unaligned(reg->key,
(__be64 *)&buffer[offset + 8 * i]);
put_unaligned_be64(reg->key, &buffer[offset + 8 * i]);
offset += 8;
}
@@ -2474,7 +2473,7 @@ void scst_pr_read_reservation(struct scst_cmd *cmd, uint8_t *buffer,
b[6] = 0;
b[7] = 0x10;
put_unaligned(key, (__be64 *)&b[8]);
put_unaligned_be64(key, &b[8]);
b[21] = dev->pr_scope << 4 | dev->pr_type;
size = 24;
@@ -2565,7 +2564,7 @@ void scst_pr_read_full_status(struct scst_cmd *cmd, uint8_t *buffer,
if (size_max - size > rec_len) {
memset(&buffer[offset], 0, rec_len);
put_unaligned(reg->key, (__be64 *)(&buffer[offset]));
put_unaligned_be64(reg->key, &buffer[offset]);
if (dev->pr_is_set && scst_pr_is_holder(dev, reg)) {
buffer[offset + 12] = 1;