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: Mike Christie <michael.christie@oracle.com>
Link: https://lore.kernel.org/r/20230407200551.12660-5-michael.christie@oracle.com
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/scsi_common.c b/drivers/scsi/scsi_common.c
index 6e50e81a821668d760f9c1f1324f91bc63bbe6ec..11bf6c275d4e5c4cd6487db6db4b7a00f227669e 100644 (file)
--- a/drivers/scsi/scsi_common.c
+++ b/drivers/scsi/scsi_common.c
@@ -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.

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5c0f235a05029c573bad3d00c2b58898a1236202..fa3123a63f65f01c9915d62ee32326ca71db5fa1 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -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 @@ out_unlock:
        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)

diff --git a/include/scsi/scsi_common.h b/include/scsi/scsi_common.h
index 5b567b43e1b167e613556eb1fd92ef5474dfcd7a..e25291bbbe9b061abeb821837e9f687e948b7dab 100644 (file)
--- a/include/scsi/scsi_common.h
+++ b/include/scsi/scsi_common.h
@@ -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)
 {