Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a904e5d authored by Rob Evers's avatar Rob Evers Committed by Christoph Hellwig
Browse files

scsi: use set/get_unaligned_be32 in report_luns 



Signed-off-by: default avatarRob Evers <revers@redhat.com>
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent eb9eea01

drivers/scsi/scsi_scan.c

+3 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/spinlock.h>

#include <linux/async.h>

#include <linux/slab.h>

#include <asm/unaligned.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -1367,7 +1368,6 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 
	unsigned int retries;

	int result;

	struct scsi_lun *lunp, *lun_data;

	u8 *data;

	struct scsi_sense_hdr sshdr;

	struct scsi_device *sdev;

	struct Scsi_Host *shost = dev_to_shost(&starget->dev);
@@ -1433,10 +1433,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 
	/*

	 * bytes 6 - 9: length of the command.

	 */

	scsi_cmd[6] = (unsigned char) (length >> 24) & 0xff;

	scsi_cmd[7] = (unsigned char) (length >> 16) & 0xff;

	scsi_cmd[8] = (unsigned char) (length >> 8) & 0xff;

	scsi_cmd[9] = (unsigned char) length & 0xff;

	put_unaligned_be32(length, &scsi_cmd[6]);



	scsi_cmd[10] = 0;	/* reserved */

	scsi_cmd[11] = 0;	/* control */
@@ -1484,9 +1481,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, 
	/*

	 * Get the length from the first four bytes of lun_data.

	 */

	data = (u8 *) lun_data->scsi_lun;

	length = ((data[0] << 24) | (data[1] << 16) |

		  (data[2] << 8) | (data[3] << 0));

	length = get_unaligned_be32(lun_data->scsi_lun);



	num_luns = (length / sizeof(struct scsi_lun));

	if (num_luns > max_scsi_report_luns) {