Linux SCSI subsystem development
 help / color / mirror / Atom feed
From: Mike Christie <michael.christie@oracle.com>
To: bvanassche@acm.org, hch@lst.de, martin.petersen@oracle.com,
	linux-scsi@vger.kernel.org,
	james.bottomley@hansenpartnership.com,
	linux-block@vger.kernel.org, dm-devel@redhat.com,
	snitzer@kernel.org, axboe@kernel.dk,
	linux-nvme@lists.infradead.org, chaitanyak@nvidia.com,
	kbusch@kernel.org, target-devel@vger.kernel.org
Cc: Mike Christie <michael.christie@oracle.com>,
	Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH v6 03/18] scsi: Rename sd_pr_command
Date: Fri,  7 Apr 2023 15:05:36 -0500	[thread overview]
Message-ID: <20230407200551.12660-4-michael.christie@oracle.com> (raw)
In-Reply-To: <20230407200551.12660-1-michael.christie@oracle.com>

Rename sd_pr_command to sd_pr_out_command to match a
sd_pr_in_command helper added in the next patches.

Signed-off-by: Mike Christie <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>
---
 drivers/scsi/sd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 4bb87043e6db..00b9b6145fbc 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1742,7 +1742,7 @@ static int sd_scsi_to_pr_err(struct scsi_sense_hdr *sshdr, int result)
 	}
 }
 
-static int sd_pr_command(struct block_device *bdev, u8 sa,
+static int sd_pr_out_command(struct block_device *bdev, u8 sa,
 		u64 key, u64 sa_key, u8 type, u8 flags)
 {
 	struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
@@ -1785,7 +1785,7 @@ static int sd_pr_register(struct block_device *bdev, u64 old_key, u64 new_key,
 {
 	if (flags & ~PR_FL_IGNORE_KEY)
 		return -EOPNOTSUPP;
-	return sd_pr_command(bdev, (flags & PR_FL_IGNORE_KEY) ? 0x06 : 0x00,
+	return sd_pr_out_command(bdev, (flags & PR_FL_IGNORE_KEY) ? 0x06 : 0x00,
 			old_key, new_key, 0,
 			(1 << 0) /* APTPL */);
 }
@@ -1795,24 +1795,24 @@ static int sd_pr_reserve(struct block_device *bdev, u64 key, enum pr_type type,
 {
 	if (flags)
 		return -EOPNOTSUPP;
-	return sd_pr_command(bdev, 0x01, key, 0, sd_pr_type(type), 0);
+	return sd_pr_out_command(bdev, 0x01, key, 0, sd_pr_type(type), 0);
 }
 
 static int sd_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
 {
-	return sd_pr_command(bdev, 0x02, key, 0, sd_pr_type(type), 0);
+	return sd_pr_out_command(bdev, 0x02, key, 0, sd_pr_type(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_command(bdev, abort ? 0x05 : 0x04, old_key, new_key,
+	return sd_pr_out_command(bdev, abort ? 0x05 : 0x04, old_key, new_key,
 			     sd_pr_type(type), 0);
 }
 
 static int sd_pr_clear(struct block_device *bdev, u64 key)
 {
-	return sd_pr_command(bdev, 0x03, key, 0, 0, 0);
+	return sd_pr_out_command(bdev, 0x03, key, 0, 0, 0);
 }
 
 static const struct pr_ops sd_pr_ops = {
-- 
2.25.1


  parent reply	other threads:[~2023-04-07 20:06 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-07 20:05 [PATCH v6 00/18] Use block pr_ops in LIO Mike Christie
2023-04-07 20:05 ` [PATCH v6 01/18] block: Add PR callouts for read keys and reservation Mike Christie
2023-04-11  7:09   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 02/18] block: Rename BLK_STS_NEXUS to BLK_STS_RESV_CONFLICT Mike Christie
2023-04-08  8:05   ` Chaitanya Kulkarni
2023-04-11  5:33   ` Christoph Hellwig
2023-04-11  7:09   ` Hannes Reinecke
2023-04-07 20:05 ` Mike Christie [this message]
2023-04-11  7:10   ` [PATCH v6 03/18] scsi: Rename sd_pr_command Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 04/18] scsi: Move sd_pr_type to scsi_common Mike Christie
2023-04-07 20:08   ` Bart Van Assche
2023-04-11  5:33   ` Christoph Hellwig
2023-04-11  7:11   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 05/18] scsi: Add support for block PR read keys/reservation Mike Christie
2023-04-11  7:13   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 06/18] dm: " Mike Christie
2023-04-11  7:13   ` Hannes Reinecke
2023-04-17 19:13   ` Mike Snitzer
2023-04-07 20:05 ` [PATCH v6 07/18] nvme: Fix reservation status related structs Mike Christie
2023-04-11  5:34   ` Christoph Hellwig
2023-04-11  7:15   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 08/18] nvme: Don't hardcode the data len for pr commands Mike Christie
2023-04-11  7:15   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 09/18] nvme: Move pr code to it's own file Mike Christie
2023-04-11  5:35   ` Christoph Hellwig
2023-04-11  7:17   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 10/18] nvme: Add helper to send pr command Mike Christie
2023-04-08  8:07   ` Chaitanya Kulkarni
2023-04-11  7:18   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 11/18] nvme: Add pr_ops read_keys support Mike Christie
2023-04-08  8:11   ` Chaitanya Kulkarni
2023-04-11  7:20   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 12/18] nvme: Add a nvme_pr_type enum Mike Christie
2023-04-11  7:29   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 13/18] nvme: Add pr_ops read_reservation support Mike Christie
2023-04-11  5:35   ` Christoph Hellwig
2023-04-11  7:30   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 14/18] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie
2023-04-11  7:30   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 15/18] scsi: target: Allow backends to hook into PR handling Mike Christie
2023-04-11  7:31   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 16/18] scsi: target: Pass struct target_opcode_descriptor to enabled Mike Christie
2023-04-11  5:36   ` Christoph Hellwig
2023-04-11  7:31   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 17/18] scsi: target: Report and detect unsupported PR commands Mike Christie
2023-04-11  5:36   ` Christoph Hellwig
2023-04-11  7:32   ` Hannes Reinecke
2023-04-07 20:05 ` [PATCH v6 18/18] scsi: target: Add block PR support to iblock Mike Christie
2023-04-11  5:36   ` Christoph Hellwig
2023-04-11  7:33   ` Hannes Reinecke
2023-04-12  9:36 ` [PATCH v6 00/18] Use block pr_ops in LIO Naresh Kamboju
2023-04-12 10:25   ` Naresh Kamboju
2023-04-12 18:28     ` Mike Christie
2023-04-13  9:50       ` Naresh Kamboju
2023-04-12 10:57 ` Naresh Kamboju

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230407200551.12660-4-michael.christie@oracle.com \
    --to=michael.christie@oracle.com \
    --cc=axboe@kernel.dk \
    --cc=bvanassche@acm.org \
    --cc=chaitanyak@nvidia.com \
    --cc=dm-devel@redhat.com \
    --cc=hch@lst.de \
    --cc=james.bottomley@hansenpartnership.com \
    --cc=kbusch@kernel.org \
    --cc=kch@nvidia.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=snitzer@kernel.org \
    --cc=target-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox