Commit 0730b163 authored by Mike Christie's avatar Mike Christie Committed by Martin K. Petersen
Browse files

scsi: Move sd_pr_type to scsi_common 



LIO is going to want to do the same block to/from SCSI pr types as sd.c
so this moves the sd_pr_type helper to scsi_common and renames it. The
next patch will then also add a helper to go from the SCSI value to the
block one for use with PERSISTENT_RESERVE_IN commands.

Signed-off-by: default avatarMike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20230407200551.12660-5-michael.christie@oracle.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 20bebccb

drivers/scsi/scsi_common.c

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

#include <linux/errno.h>

#include <linux/module.h>

#include <uapi/linux/pr.h>

#include <asm/unaligned.h>

#include <scsi/scsi_common.h>
@@ -63,6 +64,27 @@ const char *scsi_device_type(unsigned type) 
}

EXPORT_SYMBOL(scsi_device_type);



enum scsi_pr_type block_pr_type_to_scsi(enum pr_type type)

{

	switch (type) {

	case PR_WRITE_EXCLUSIVE:

		return SCSI_PR_WRITE_EXCLUSIVE;

	case PR_EXCLUSIVE_ACCESS:

		return SCSI_PR_EXCLUSIVE_ACCESS;

	case PR_WRITE_EXCLUSIVE_REG_ONLY:

		return SCSI_PR_WRITE_EXCLUSIVE_REG_ONLY;

	case PR_EXCLUSIVE_ACCESS_REG_ONLY:

		return SCSI_PR_EXCLUSIVE_ACCESS_REG_ONLY;

	case PR_WRITE_EXCLUSIVE_ALL_REGS:

		return SCSI_PR_WRITE_EXCLUSIVE_ALL_REGS;

	case PR_EXCLUSIVE_ACCESS_ALL_REGS:

		return SCSI_PR_EXCLUSIVE_ACCESS_ALL_REGS;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(block_pr_type_to_scsi);



/**

 * scsilun_to_int - convert a scsi_lun to an int

 * @scsilun:	struct scsi_lun to be converted.

drivers/scsi/sd.c

+8 −25
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_ioctl.h>

#include <scsi/scsicam.h>

#include <scsi/scsi_common.h>



#include "sd.h"

#include "scsi_priv.h"
@@ -1692,26 +1693,6 @@ static int sd_get_unique_id(struct gendisk *disk, u8 id[16], 
	return ret;

}



static char sd_pr_type(enum pr_type type)

{

	switch (type) {

	case PR_WRITE_EXCLUSIVE:

		return 0x01;

	case PR_EXCLUSIVE_ACCESS:

		return 0x03;

	case PR_WRITE_EXCLUSIVE_REG_ONLY:

		return 0x05;

	case PR_EXCLUSIVE_ACCESS_REG_ONLY:

		return 0x06;

	case PR_WRITE_EXCLUSIVE_ALL_REGS:

		return 0x07;

	case PR_EXCLUSIVE_ACCESS_ALL_REGS:

		return 0x08;

	default:

		return 0;

	}

};



static int sd_scsi_to_pr_err(struct scsi_sense_hdr *sshdr, int result)

{

	switch (host_byte(result)) {
@@ -1742,8 +1723,8 @@ static int sd_scsi_to_pr_err(struct scsi_sense_hdr *sshdr, int result) 
	}

}



static int sd_pr_out_command(struct block_device *bdev, u8 sa,

		u64 key, u64 sa_key, u8 type, u8 flags)

static int sd_pr_out_command(struct block_device *bdev, u8 sa, u64 key,

			     u64 sa_key, enum scsi_pr_type type, u8 flags)

{

	struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);

	struct scsi_device *sdev = sdkp->device;
@@ -1795,19 +1776,21 @@ static int sd_pr_reserve(struct block_device *bdev, u64 key, enum pr_type type, 
{

	if (flags)

		return -EOPNOTSUPP;

	return sd_pr_out_command(bdev, 0x01, key, 0, sd_pr_type(type), 0);

	return sd_pr_out_command(bdev, 0x01, key, 0,

				 block_pr_type_to_scsi(type), 0);

}



static int sd_pr_release(struct block_device *bdev, u64 key, enum pr_type type)

{

	return sd_pr_out_command(bdev, 0x02, key, 0, sd_pr_type(type), 0);

	return sd_pr_out_command(bdev, 0x02, key, 0,

				 block_pr_type_to_scsi(type), 0);

}



static int sd_pr_preempt(struct block_device *bdev, u64 old_key, u64 new_key,

		enum pr_type type, bool abort)

{

	return sd_pr_out_command(bdev, abort ? 0x05 : 0x04, old_key, new_key,

			     sd_pr_type(type), 0);

				 block_pr_type_to_scsi(type), 0);

}



static int sd_pr_clear(struct block_device *bdev, u64 key)

include/scsi/scsi_common.h

+12 −0
Original line number Diff line number Diff line
@@ -7,8 +7,20 @@ 
#define _SCSI_COMMON_H_



#include <linux/types.h>

#include <uapi/linux/pr.h>

#include <scsi/scsi_proto.h>



enum scsi_pr_type {

	SCSI_PR_WRITE_EXCLUSIVE			= 0x01,

	SCSI_PR_EXCLUSIVE_ACCESS		= 0x03,

	SCSI_PR_WRITE_EXCLUSIVE_REG_ONLY	= 0x05,

	SCSI_PR_EXCLUSIVE_ACCESS_REG_ONLY	= 0x06,

	SCSI_PR_WRITE_EXCLUSIVE_ALL_REGS	= 0x07,

	SCSI_PR_EXCLUSIVE_ACCESS_ALL_REGS	= 0x08,

};



enum scsi_pr_type block_pr_type_to_scsi(enum pr_type type);



static inline unsigned

scsi_varlen_cdb_length(const void *hdr)

{