diff options
author | Mike Anderson <andmike@us.ibm.com> | 2005-06-16 14:12:38 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-07-30 12:10:24 -0400 |
commit | d3301874083874f8a0ac88aa1bb7da6b62df34d2 (patch) | |
tree | ceb564fe0a965588f14b441ef0dc93b36953b6b2 /include/scsi | |
parent | 5dbffcd83d826a9b42a10afb89b13156dc5b9539 (diff) |
[SCSI] host state model update: replace old host bitmap state
Migrate the current SCSI host state model to a model like SCSI
device is using.
Signed-off-by: Mike Anderson <andmike@us.ibm.com>
Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/scsi_host.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 81d5234f6771..0b1e275b2699 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -429,12 +429,15 @@ struct scsi_host_template { | |||
429 | }; | 429 | }; |
430 | 430 | ||
431 | /* | 431 | /* |
432 | * shost states | 432 | * shost state: If you alter this, you also need to alter scsi_sysfs.c |
433 | * (for the ascii descriptions) and the state model enforcer: | ||
434 | * scsi_host_set_state() | ||
433 | */ | 435 | */ |
434 | enum { | 436 | enum scsi_host_state { |
435 | SHOST_ADD, | 437 | SHOST_CREATED = 1, |
436 | SHOST_DEL, | 438 | SHOST_RUNNING, |
437 | SHOST_CANCEL, | 439 | SHOST_CANCEL, |
440 | SHOST_DEL, | ||
438 | SHOST_RECOVERY, | 441 | SHOST_RECOVERY, |
439 | }; | 442 | }; |
440 | 443 | ||
@@ -575,7 +578,7 @@ struct Scsi_Host { | |||
575 | unsigned int irq; | 578 | unsigned int irq; |
576 | 579 | ||
577 | 580 | ||
578 | unsigned long shost_state; | 581 | enum scsi_host_state shost_state; |
579 | 582 | ||
580 | /* ldm bits */ | 583 | /* ldm bits */ |
581 | struct device shost_gendev; | 584 | struct device shost_gendev; |
@@ -633,6 +636,7 @@ extern void scsi_remove_host(struct Scsi_Host *); | |||
633 | extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *); | 636 | extern struct Scsi_Host *scsi_host_get(struct Scsi_Host *); |
634 | extern void scsi_host_put(struct Scsi_Host *t); | 637 | extern void scsi_host_put(struct Scsi_Host *t); |
635 | extern struct Scsi_Host *scsi_host_lookup(unsigned short); | 638 | extern struct Scsi_Host *scsi_host_lookup(unsigned short); |
639 | extern const char *scsi_host_state_name(enum scsi_host_state); | ||
636 | 640 | ||
637 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); | 641 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); |
638 | 642 | ||