From: Mike Christie <michael.christie@oracle.com> To: linux-block@vger.kernel.org, dm-devel@redhat.com, snitzer@kernel.org, hch@lst.de, axboe@kernel.dk, martin.petersen@oracle.com, james.bottomley@hansenpartnership.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <michael.christie@oracle.com> Subject: [PATCH 02/11] scsi: Rename sd_pr_command. Date: Fri, 3 Jun 2022 01:55:27 -0500 [thread overview] Message-ID: <20220603065536.5641-3-michael.christie@oracle.com> (raw) In-Reply-To: <20220603065536.5641-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> --- 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 dc6e55761fd1..24e61647064c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1703,7 +1703,7 @@ static char sd_pr_type(enum pr_type type) } }; -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); @@ -1739,7 +1739,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 */); } @@ -1749,24 +1749,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
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <michael.christie@oracle.com> To: linux-block@vger.kernel.org, dm-devel@redhat.com, snitzer@kernel.org, hch@lst.de, axboe@kernel.dk, martin.petersen@oracle.com, james.bottomley@hansenpartnership.com, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <michael.christie@oracle.com> Subject: [dm-devel] [PATCH 02/11] scsi: Rename sd_pr_command. Date: Fri, 3 Jun 2022 01:55:27 -0500 [thread overview] Message-ID: <20220603065536.5641-3-michael.christie@oracle.com> (raw) In-Reply-To: <20220603065536.5641-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> --- 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 dc6e55761fd1..24e61647064c 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1703,7 +1703,7 @@ static char sd_pr_type(enum pr_type type) } }; -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); @@ -1739,7 +1739,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 */); } @@ -1749,24 +1749,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 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-06-03 6:56 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-03 6:55 [PATCH 0/8] Use block pr_ops in LIO Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 6:55 ` [PATCH 01/11] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-20 7:12 ` Christoph Hellwig 2022-06-20 7:12 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` Mike Christie [this message] 2022-06-03 6:55 ` [dm-devel] [PATCH 02/11] scsi: Rename sd_pr_command Mike Christie 2022-06-20 7:13 ` Christoph Hellwig 2022-06-20 7:13 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` [PATCH 03/11] scsi: Move sd_pr_type to header to share Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-05 3:58 ` Bart Van Assche 2022-06-05 3:58 ` [dm-devel] " Bart Van Assche 2022-06-20 7:13 ` Christoph Hellwig 2022-06-20 7:13 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` [PATCH 04/11] block: Add PR callouts for read keys and reservation Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-20 7:14 ` Christoph Hellwig 2022-06-20 7:14 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` [PATCH 05/11] scsi: Add support for block PR read keys/reservation Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 6:55 ` [PATCH 06/11] dm: " Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 6:55 ` [PATCH 07/11] scsi: target: Allow backends to hook into PR handling Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-20 7:15 ` Christoph Hellwig 2022-06-20 7:15 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` [PATCH 08/11] scsi: target: Add block PR support to iblock Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-20 7:18 ` Christoph Hellwig 2022-06-20 7:18 ` [dm-devel] " Christoph Hellwig 2022-06-03 6:55 ` [PATCH 09/11] block, nvme: Add error for reservation conflicts Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 19:45 ` Keith Busch 2022-06-03 19:45 ` [dm-devel] " Keith Busch 2022-06-03 23:08 ` Mike Christie 2022-06-03 23:08 ` [dm-devel] " Mike Christie 2022-06-04 7:38 ` Hannes Reinecke 2022-06-04 7:38 ` [dm-devel] " Hannes Reinecke 2022-06-04 17:13 ` michael.christie 2022-06-04 17:13 ` [dm-devel] " michael.christie 2022-06-05 9:42 ` Hannes Reinecke 2022-06-05 9:42 ` [dm-devel] " Hannes Reinecke 2022-06-20 7:23 ` Christoph Hellwig 2022-06-20 7:23 ` [dm-devel] " Christoph Hellwig 2022-06-05 4:00 ` Bart Van Assche 2022-06-05 4:00 ` Bart Van Assche 2022-06-03 6:55 ` [PATCH 10/11] scsi: Use BLK_STS_RSV_CONFLICT " Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 6:55 ` [PATCH 11/11] scsi: target: Handle BLK_STS_RSV_CONFLICT Mike Christie 2022-06-03 6:55 ` [dm-devel] " Mike Christie 2022-06-03 11:46 ` [PATCH 0/8] Use block pr_ops in LIO Christoph Hellwig 2022-06-03 11:46 ` [dm-devel] " Christoph Hellwig 2022-06-03 17:55 ` Mike Christie 2022-06-03 17:55 ` [dm-devel] " Mike Christie 2022-06-20 7:12 ` Christoph Hellwig 2022-06-20 7:12 ` [dm-devel] " Christoph Hellwig 2022-06-05 4:01 ` Bart Van Assche 2022-06-05 4:01 ` Bart Van Assche 2022-06-05 16:55 ` Mike Christie 2022-06-05 16:55 ` Mike Christie 2022-06-05 18:15 ` Bart Van Assche 2022-06-05 18:15 ` Bart Van Assche 2022-06-06 16:38 ` Mike Christie 2022-06-06 16:38 ` Mike Christie
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=20220603065536.5641-3-michael.christie@oracle.com \ --to=michael.christie@oracle.com \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=hch@lst.de \ --cc=james.bottomley@hansenpartnership.com \ --cc=linux-block@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.