Commit a7089770 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi_dh_alua: use unaligned access macros 



Use 'get_unaligned_XX' and 'put_unaligned_XX' instead of
open-coding it.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6c4fc044

drivers/scsi/device_handler/scsi_dh_alua.c

+8 −15
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/slab.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <asm/unaligned.h>

#include <scsi/scsi.h>

#include <scsi/scsi_dbg.h>

#include <scsi/scsi_eh.h>
@@ -152,10 +153,7 @@ static unsigned submit_rtpg(struct scsi_device *sdev, struct alua_dh_data *h) 
		rq->cmd[1] = MI_REPORT_TARGET_PGS | MI_EXT_HDR_PARAM_FMT;

	else

		rq->cmd[1] = MI_REPORT_TARGET_PGS;

	rq->cmd[6] = (h->bufflen >> 24) & 0xff;

	rq->cmd[7] = (h->bufflen >> 16) & 0xff;

	rq->cmd[8] = (h->bufflen >>  8) & 0xff;

	rq->cmd[9] = h->bufflen & 0xff;

	put_unaligned_be32(h->bufflen, &rq->cmd[6]);

	rq->cmd_len = COMMAND_SIZE(MAINTENANCE_IN);



	rq->sense = h->sense;
@@ -236,8 +234,7 @@ static unsigned submit_stpg(struct alua_dh_data *h) 
	/* Prepare the data buffer */

	memset(h->buff, 0, stpg_len);

	h->buff[4] = TPGS_STATE_OPTIMIZED & 0x0f;

	h->buff[6] = (h->group_id >> 8) & 0xff;

	h->buff[7] = h->group_id & 0xff;

	put_unaligned_be16(h->group_id, &h->buff[6]);



	rq = get_alua_req(sdev, h->buff, stpg_len, WRITE);

	if (!rq)
@@ -246,10 +243,7 @@ static unsigned submit_stpg(struct alua_dh_data *h) 
	/* Prepare the command. */

	rq->cmd[0] = MAINTENANCE_OUT;

	rq->cmd[1] = MO_SET_TARGET_PGS;

	rq->cmd[6] = (stpg_len >> 24) & 0xff;

	rq->cmd[7] = (stpg_len >> 16) & 0xff;

	rq->cmd[8] = (stpg_len >>  8) & 0xff;

	rq->cmd[9] = stpg_len & 0xff;

	put_unaligned_be32(stpg_len, &rq->cmd[6]);

	rq->cmd_len = COMMAND_SIZE(MAINTENANCE_OUT);



	rq->sense = h->sense;
@@ -343,11 +337,11 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h) 
		switch (d[1] & 0xf) {

		case 0x4:

			/* Relative target port */

			h->rel_port = (d[6] << 8) + d[7];

			h->rel_port = get_unaligned_be16(&d[6]);

			break;

		case 0x5:

			/* Target port group */

			h->group_id = (d[6] << 8) + d[7];

			h->group_id = get_unaligned_be16(&d[6]);

			break;

		default:

			break;
@@ -540,8 +534,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h, int wait_ 
		return SCSI_DH_IO;

	}



	len = (h->buff[0] << 24) + (h->buff[1] << 16) +

		(h->buff[2] << 8) + h->buff[3] + 4;

	len = get_unaligned_be32(&h->buff[0]) + 4;



	if (len > h->bufflen) {

		/* Resubmit with the correct length */
@@ -576,7 +569,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h, int wait_ 
	     k < len;

	     k += off, ucp += off) {



		if (h->group_id == (ucp[2] << 8) + ucp[3]) {

		if (h->group_id == get_unaligned_be16(&ucp[2])) {

			h->state = ucp[0] & 0x0f;

			h->pref = ucp[0] >> 7;

			valid_states = ucp[1];

CRA Git | Maintained and supported by SUSTech CRA and CCSE