Commit 2599cac5 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

scsi/core: Use the new blk_opf_t type 



Use the new blk_opf_t type for arguments and variables that represent
request flags. Use the !! operator in scsi_noretry_cmd() to convert the
blk_opf_t type into a boolean. This patch does not change any functionality.

Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: John Garry <john.garry@huawei.com>
Cc: Mike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-42-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 88b32c3c

drivers/scsi/scsi_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason) 
int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,

		 int data_direction, void *buffer, unsigned bufflen,

		 unsigned char *sense, struct scsi_sense_hdr *sshdr,

		 int timeout, int retries, u64 flags, req_flags_t rq_flags,

		 int *resid)

		 int timeout, int retries, blk_opf_t flags,

		 req_flags_t rq_flags, int *resid)

{

	struct request *req;

	struct scsi_cmnd *scmd;
@@ -633,7 +633,7 @@ static blk_status_t scsi_result_to_blk_status(struct scsi_cmnd *cmd, int result) 
 */

static unsigned int scsi_rq_err_bytes(const struct request *rq)

{

	unsigned int ff = rq->cmd_flags & REQ_FAILFAST_MASK;

	blk_opf_t ff = rq->cmd_flags & REQ_FAILFAST_MASK;

	unsigned int bytes = 0;

	struct bio *bio;

include/scsi/scsi_device.h

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ extern void scsi_sanitize_inquiry_string(unsigned char *s, int len); 
extern int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,

			int data_direction, void *buffer, unsigned bufflen,

			unsigned char *sense, struct scsi_sense_hdr *sshdr,

			int timeout, int retries, u64 flags,

			int timeout, int retries, blk_opf_t flags,

			req_flags_t rq_flags, int *resid);

/* Make sure any sense buffer is the correct size. */

#define scsi_execute(sdev, cmd, data_direction, buffer, bufflen, sense,	\