scsi: core: Add struct for args to execution functions

[linux-block.git] / drivers / scsi / scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9ed1ebcb7443c3b5bec7d474c6f37e5873f5e7cd..7d324db6b2f74487b8374bb9bcdebd4923dafad2 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -185,39 +185,37 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
        __scsi_queue_insert(cmd, reason, true);
 }
 
-
 /**
- * __scsi_execute - insert request and wait for the result
- * @sdev:      scsi device
+ * scsi_execute_cmd - insert request and wait for the result
+ * @sdev:      scsi_device
  * @cmd:       scsi command
- * @data_direction: data direction
+ * @opf:       block layer request cmd_flags
  * @buffer:    data buffer
  * @bufflen:   len of buffer
- * @sense:     optional sense buffer
- * @sshdr:     optional decoded sense header
  * @timeout:   request timeout in HZ
  * @retries:   number of times to retry request
- * @flags:     flags for ->cmd_flags
- * @rq_flags:  flags for ->rq_flags
- * @resid:     optional residual length
+ * @args:      Optional args. See struct definition for field descriptions
  *
  * Returns the scsi_cmnd result field if a command was executed, or a negative
  * Linux error code if we didn't get that far.
  */
-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, blk_opf_t flags,
-                req_flags_t rq_flags, int *resid)
+int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
+                    blk_opf_t opf, void *buffer, unsigned int bufflen,
+                    int timeout, int retries,
+                    const struct scsi_exec_args *args)
 {
+       static const struct scsi_exec_args default_args;
        struct request *req;
        struct scsi_cmnd *scmd;
        int ret;
 
-       req = scsi_alloc_request(sdev->request_queue,
-                       data_direction == DMA_TO_DEVICE ?
-                       REQ_OP_DRV_OUT : REQ_OP_DRV_IN,
-                       rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0);
+       if (!args)
+               args = &default_args;
+       else if (WARN_ON_ONCE(args->sense &&
+                             args->sense_len != SCSI_SENSE_BUFFERSIZE))
+               return -EINVAL;
+
+       req = scsi_alloc_request(sdev->request_queue, opf, args->req_flags);
        if (IS_ERR(req))
                return PTR_ERR(req);
 
@@ -232,8 +230,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
        memcpy(scmd->cmnd, cmd, scmd->cmd_len);
        scmd->allowed = retries;
        req->timeout = timeout;
-       req->cmd_flags |= flags;
-       req->rq_flags |= rq_flags | RQF_QUIET;
+       req->rq_flags |= RQF_QUIET;
 
        /*
         * head injection *required* here otherwise quiesce won't work
@@ -249,20 +246,21 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
        if (unlikely(scmd->resid_len > 0 && scmd->resid_len <= bufflen))
                memset(buffer + bufflen - scmd->resid_len, 0, scmd->resid_len);
 
-       if (resid)
-               *resid = scmd->resid_len;
-       if (sense && scmd->sense_len)
-               memcpy(sense, scmd->sense_buffer, SCSI_SENSE_BUFFERSIZE);
-       if (sshdr)
+       if (args->resid)
+               *args->resid = scmd->resid_len;
+       if (args->sense)
+               memcpy(args->sense, scmd->sense_buffer, SCSI_SENSE_BUFFERSIZE);
+       if (args->sshdr)
                scsi_normalize_sense(scmd->sense_buffer, scmd->sense_len,
-                                    sshdr);
+                                    args->sshdr);
+
        ret = scmd->result;
  out:
        blk_mq_free_request(req);
 
        return ret;
 }
-EXPORT_SYMBOL(__scsi_execute);
+EXPORT_SYMBOL(scsi_execute_cmd);
 
 /*
  * Wake up the error handler if necessary. Avoid as follows that the error