[SCSI] remove scsi_cmnd->owner

never checked anywhere

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 5add683..b25e5e5 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -260,7 +260,6 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, int gfp_mask)
                memset(cmd, 0, sizeof(*cmd));
                cmd->device = dev;
                cmd->state = SCSI_STATE_UNUSED;
-               cmd->owner = SCSI_OWNER_NOBODY;
                init_timer(&cmd->eh_timeout);
                INIT_LIST_HEAD(&cmd->list);
                spin_lock_irqsave(&dev->list_lock, flags);
@@ -612,7 +611,6 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         */
 
        cmd->state = SCSI_STATE_QUEUED;
-       cmd->owner = SCSI_OWNER_LOWLEVEL;
 
        atomic_inc(&cmd->device->iorequest_cnt);
 
@@ -683,7 +681,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)
 {
        sreq->sr_command = cmd;
 
-       cmd->owner = SCSI_OWNER_MIDLEVEL;
        cmd->cmd_len = sreq->sr_cmd_len;
        cmd->use_sg = sreq->sr_use_sg;
 
@@ -768,7 +765,6 @@ void __scsi_done(struct scsi_cmnd *cmd)
         */
        cmd->serial_number = 0;
        cmd->state = SCSI_STATE_BHQUEUE;
-       cmd->owner = SCSI_OWNER_BH_HANDLER;
 
        atomic_inc(&cmd->device->iodone_cnt);
        if (cmd->result)
@@ -889,7 +885,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
        SCSI_LOG_MLCOMPLETE(4, printk("Notifying upper driver of completion "
                                "for device %d %x\n", sdev->id, cmd->result));
 
-       cmd->owner = SCSI_OWNER_HIGHLEVEL;
        cmd->state = SCSI_STATE_FINISHED;
 
        /*

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index af61f98..0df8615 100644 (file)
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -77,7 +77,6 @@ int scsi_eh_scmd_add(struct scsi_cmnd *scmd, int eh_flag)
        /*
         * FIXME: Can we stop setting owner and state.
         */
-       scmd->owner = SCSI_OWNER_ERROR_HANDLER;
        scmd->state = SCSI_STATE_FAILED;
        list_add_tail(&scmd->eh_entry, &shost->eh_cmd_q);
        set_bit(SHOST_RECOVERY, &shost->shost_state);
@@ -451,7 +450,6 @@ static void scsi_eh_done(struct scsi_cmnd *scmd)
         */
        if (del_timer(&scmd->eh_timeout)) {
                scmd->request->rq_status = RQ_SCSI_DONE;
-               scmd->owner = SCSI_OWNER_ERROR_HANDLER;
 
                SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n",
                                           __FUNCTION__, scmd, scmd->result));
@@ -484,8 +482,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
         * we will use a queued command if possible, otherwise we will
         * emulate the queuing and calling of completion function ourselves.
         */
-       scmd->owner = SCSI_OWNER_LOWLEVEL;
-
        if (sdev->scsi_level <= SCSI_2)
                scmd->cmnd[1] = (scmd->cmnd[1] & 0x1f) |
                        (sdev->lun << 5 & 0xe0);
@@ -514,7 +510,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
         */
        if (scsi_eh_eflags_chk(scmd, SCSI_EH_REC_TIMEOUT)) {
                scsi_eh_eflags_clr(scmd,  SCSI_EH_REC_TIMEOUT);
-               scmd->owner = SCSI_OWNER_LOWLEVEL;
 
                /*
                 * as far as the low level driver is
@@ -530,8 +525,6 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, int timeout)
                        shost->hostt->eh_abort_handler(scmd);
                        
                scmd->request->rq_status = RQ_SCSI_DONE;
-               scmd->owner = SCSI_OWNER_ERROR_HANDLER;
-                       
                rtn = FAILED;
        }
 
@@ -742,9 +735,6 @@ static int scsi_try_to_abort_cmd(struct scsi_cmnd *scmd)
         */
        if (scmd->serial_number == 0)
                return SUCCESS;
-
-       scmd->owner = SCSI_OWNER_LOWLEVEL;
-
        return scmd->device->host->hostt->eh_abort_handler(scmd);
 }
 
@@ -862,10 +852,7 @@ static int scsi_try_bus_device_reset(struct scsi_cmnd *scmd)
        if (!scmd->device->host->hostt->eh_device_reset_handler)
                return FAILED;
 
-       scmd->owner = SCSI_OWNER_LOWLEVEL;
-
        rtn = scmd->device->host->hostt->eh_device_reset_handler(scmd);
-
        if (rtn == SUCCESS) {
                scmd->device->was_reset = 1;
                scmd->device->expecting_cc_ua = 1;
@@ -1048,7 +1035,6 @@ static int scsi_try_bus_reset(struct scsi_cmnd *scmd)
 
        SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Bus RST\n",
                                          __FUNCTION__));
-       scmd->owner = SCSI_OWNER_LOWLEVEL;
 
        if (!scmd->device->host->hostt->eh_bus_reset_handler)
                return FAILED;
@@ -1077,7 +1063,6 @@ static int scsi_try_host_reset(struct scsi_cmnd *scmd)
 
        SCSI_LOG_ERROR_RECOVERY(3, printk("%s: Snd Host RST\n",
                                          __FUNCTION__));
-       scmd->owner = SCSI_OWNER_LOWLEVEL;
 
        if (!scmd->device->host->hostt->eh_host_reset_handler)
                return FAILED;
@@ -1819,8 +1804,7 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
        memset(&scmd->eh_timeout, 0, sizeof(scmd->eh_timeout));
        scmd->request->rq_status        = RQ_SCSI_BUSY;
        scmd->state                     = SCSI_STATE_INITIALIZING;
-       scmd->owner                     = SCSI_OWNER_MIDLEVEL;
-    
+
        memset(&scmd->cmnd, '\0', sizeof(scmd->cmnd));
     
        scmd->scsi_done         = scsi_reset_provider_done_command;

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index b4f3208..912cea0 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -149,7 +149,6 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
         * Register the fact that we own the thing for now.
         */
        cmd->state = SCSI_STATE_MLQUEUE;
-       cmd->owner = SCSI_OWNER_MIDLEVEL;
 
        /*
         * Decrement the counters, since these commands are no longer
@@ -299,7 +298,6 @@ EXPORT_SYMBOL(scsi_wait_req);
  */
 static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
 {
-       cmd->owner = SCSI_OWNER_MIDLEVEL;
        cmd->serial_number = 0;
 
        memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer);

diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 96d4f74..e0f5b5d 100644 (file)
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -13,17 +13,6 @@ struct Scsi_Host;
 
 
 /*
- * These are the values that the owner field can take.
- * They are used as an indication of who the command belongs to.
- */
-#define SCSI_OWNER_HIGHLEVEL      0x100
-#define SCSI_OWNER_MIDLEVEL       0x101
-#define SCSI_OWNER_LOWLEVEL       0x102
-#define SCSI_OWNER_ERROR_HANDLER  0x103
-#define SCSI_OWNER_BH_HANDLER     0x104
-#define SCSI_OWNER_NOBODY         0x105
-
-/*
  * Magic values for certain scsi structs. Shouldn't ever be used.
  */
 #define SCSI_CMND_MAGIC                0xE25C23A5

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 5f8c907..0c14921 100644 (file)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -32,7 +32,6 @@ struct scsi_cmnd {
 
        struct scsi_device *device;
        unsigned short state;
-       unsigned short owner;
        struct scsi_request *sc_request;
 
        struct list_head list;  /* scsi_cmnd participates in queue lists */