Skip to content

Commit

Permalink
scsi_dh_alua: use common definitions for ALUA state
Browse files Browse the repository at this point in the history 
scsi_proto.h now contains definitions for the ALUA state, so we don't
have to carry them in the device handler.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Bart van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  • Loading branch information
Hannes Reinecke authored and Martin K. Petersen committed Mar 5, 2016
1 parent 77c9df9 commit 5115fc7
Showing 1 changed file with 25 additions and 33 deletions.
58 changes: 25 additions & 33 deletions drivers/scsi/device_handler/scsi_dh_alua.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@
#define ALUA_DH_NAME "alua"
#define ALUA_DH_VER "2.0"

#define TPGS_STATE_OPTIMIZED 0x0
#define TPGS_STATE_NONOPTIMIZED 0x1
#define TPGS_STATE_STANDBY 0x2
#define TPGS_STATE_UNAVAILABLE 0x3
#define TPGS_STATE_LBA_DEPENDENT 0x4
#define TPGS_STATE_OFFLINE 0xe
#define TPGS_STATE_TRANSITIONING 0xf

#define TPGS_SUPPORT_NONE 0x00
#define TPGS_SUPPORT_OPTIMIZED 0x01
#define TPGS_SUPPORT_NONOPTIMIZED 0x02
Expand Down Expand Up @@ -180,7 +172,7 @@ static int submit_stpg(struct scsi_device *sdev, int group_id,

/* Prepare the data buffer */
memset(stpg_data, 0, stpg_len);
stpg_data[4] = TPGS_STATE_OPTIMIZED & 0x0f;
stpg_data[4] = SCSI_ACCESS_STATE_OPTIMAL;
put_unaligned_be16(group_id, &stpg_data[6]);

/* Prepare the command. */
Expand Down Expand Up @@ -248,7 +240,7 @@ struct alua_port_group *alua_alloc_pg(struct scsi_device *sdev,
}
pg->group_id = group_id;
pg->tpgs = tpgs;
pg->state = TPGS_STATE_OPTIMIZED;
pg->state = SCSI_ACCESS_STATE_OPTIMAL;
if (optimize_stpg)
pg->flags |= ALUA_OPTIMIZE_STPG;
kref_init(&pg->kref);
Expand Down Expand Up @@ -378,22 +370,22 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h,
return SCSI_DH_OK;
}

static char print_alua_state(int state)
static char print_alua_state(unsigned char state)
{
switch (state) {
case TPGS_STATE_OPTIMIZED:
case SCSI_ACCESS_STATE_OPTIMAL:
return 'A';
case TPGS_STATE_NONOPTIMIZED:
case SCSI_ACCESS_STATE_ACTIVE:
return 'N';
case TPGS_STATE_STANDBY:
case SCSI_ACCESS_STATE_STANDBY:
return 'S';
case TPGS_STATE_UNAVAILABLE:
case SCSI_ACCESS_STATE_UNAVAILABLE:
return 'U';
case TPGS_STATE_LBA_DEPENDENT:
case SCSI_ACCESS_STATE_LBA:
return 'L';
case TPGS_STATE_OFFLINE:
case SCSI_ACCESS_STATE_OFFLINE:
return 'O';
case TPGS_STATE_TRANSITIONING:
case SCSI_ACCESS_STATE_TRANSITIONING:
return 'T';
default:
return 'X';
Expand Down Expand Up @@ -647,19 +639,19 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
valid_states&TPGS_SUPPORT_OPTIMIZED?'A':'a');

switch (pg->state) {
case TPGS_STATE_TRANSITIONING:
case SCSI_ACCESS_STATE_TRANSITIONING:
if (time_before(jiffies, pg->expiry)) {
/* State transition, retry */
pg->interval = 2;
err = SCSI_DH_RETRY;
} else {
/* Transitioning time exceeded, set port to standby */
err = SCSI_DH_IO;
pg->state = TPGS_STATE_STANDBY;
pg->state = SCSI_ACCESS_STATE_STANDBY;
pg->expiry = 0;
}
break;
case TPGS_STATE_OFFLINE:
case SCSI_ACCESS_STATE_OFFLINE:
/* Path unusable */
err = SCSI_DH_DEV_OFFLINED;
pg->expiry = 0;
Expand Down Expand Up @@ -693,20 +685,20 @@ static unsigned alua_stpg(struct scsi_device *sdev, struct alua_port_group *pg)
return SCSI_DH_RETRY;
}
switch (pg->state) {
case TPGS_STATE_OPTIMIZED:
case SCSI_ACCESS_STATE_OPTIMAL:
return SCSI_DH_OK;
case TPGS_STATE_NONOPTIMIZED:
case SCSI_ACCESS_STATE_ACTIVE:
if ((pg->flags & ALUA_OPTIMIZE_STPG) &&
!pg->pref &&
(pg->tpgs & TPGS_MODE_IMPLICIT))
return SCSI_DH_OK;
break;
case TPGS_STATE_STANDBY:
case TPGS_STATE_UNAVAILABLE:
case SCSI_ACCESS_STATE_STANDBY:
case SCSI_ACCESS_STATE_UNAVAILABLE:
break;
case TPGS_STATE_OFFLINE:
case SCSI_ACCESS_STATE_OFFLINE:
return SCSI_DH_IO;
case TPGS_STATE_TRANSITIONING:
case SCSI_ACCESS_STATE_TRANSITIONING:
break;
default:
sdev_printk(KERN_INFO, sdev,
Expand Down Expand Up @@ -760,7 +752,7 @@ static void alua_rtpg_work(struct work_struct *work)

pg->flags &= ~ALUA_PG_RUN_RTPG;
spin_unlock_irqrestore(&pg->lock, flags);
if (state == TPGS_STATE_TRANSITIONING) {
if (state == SCSI_ACCESS_STATE_TRANSITIONING) {
if (alua_tur(sdev) == SCSI_DH_RETRY) {
spin_lock_irqsave(&pg->lock, flags);
pg->flags &= ~ALUA_PG_RUNNING;
Expand Down Expand Up @@ -1006,19 +998,19 @@ static int alua_prep_fn(struct scsi_device *sdev, struct request *req)
{
struct alua_dh_data *h = sdev->handler_data;
struct alua_port_group __rcu *pg;
int state = TPGS_STATE_OPTIMIZED;
unsigned char state = SCSI_ACCESS_STATE_OPTIMAL;
int ret = BLKPREP_OK;

rcu_read_lock();
pg = rcu_dereference(h->pg);
if (pg)
state = pg->state;
rcu_read_unlock();
if (state == TPGS_STATE_TRANSITIONING)
if (state == SCSI_ACCESS_STATE_TRANSITIONING)
ret = BLKPREP_DEFER;
else if (state != TPGS_STATE_OPTIMIZED &&
state != TPGS_STATE_NONOPTIMIZED &&
state != TPGS_STATE_LBA_DEPENDENT) {
else if (state != SCSI_ACCESS_STATE_OPTIMAL &&
state != SCSI_ACCESS_STATE_ACTIVE &&
state != SCSI_ACCESS_STATE_LBA) {
ret = BLKPREP_KILL;
req->cmd_flags |= REQ_QUIET;
}
Expand Down

0 comments on commit 5115fc7

Please sign in to comment.