aboutsummaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2007-05-24 19:04:44 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-05-26 12:47:58 -0400
commit9ef3e4a4527e1f65b8776287c6d4fd1fca5ba98f (patch)
tree21352d4d676ada59ec83aa39963ddf0423ff6a72 /include/scsi
parentbee4fe8e63ea1985f3955323dbc98b6d6bd5c6f8 (diff)
[SCSI] fc_transport: fix sysfs deadlock on vport delete
When the vport attribute "delete" is used to delete the vport, sysfs deadlocks waiting for the write to complete, which is waiting for the sysfs teardown to complete. Moved this effort to a work_q element. Took the opportunity to make some other cosmetic changes: - removed tabs in Doc file - replaced with expanded spaces - minor copyright text and author text updates - removed a bunch of trailing whitespace Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_transport_fc.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 81ea7b4bf81e..a0d80bcaa93d 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -1,4 +1,4 @@
1/* 1/*
2 * FiberChannel transport specific attributes exported to sysfs. 2 * FiberChannel transport specific attributes exported to sysfs.
3 * 3 *
4 * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved. 4 * Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
@@ -104,7 +104,7 @@ enum fc_vport_state {
104 104
105 105
106 106
107/* 107/*
108 * FC Classes of Service 108 * FC Classes of Service
109 * Note: values are not enumerated, as they can be "or'd" together 109 * Note: values are not enumerated, as they can be "or'd" together
110 * for reporting (e.g. report supported_classes). If you alter this list, 110 * for reporting (e.g. report supported_classes). If you alter this list,
@@ -117,7 +117,7 @@ enum fc_vport_state {
117#define FC_COS_CLASS4 0x10 117#define FC_COS_CLASS4 0x10
118#define FC_COS_CLASS6 0x40 118#define FC_COS_CLASS6 0x40
119 119
120/* 120/*
121 * FC Port Speeds 121 * FC Port Speeds
122 * Note: values are not enumerated, as they can be "or'd" together 122 * Note: values are not enumerated, as they can be "or'd" together
123 * for reporting (e.g. report supported_speeds). If you alter this list, 123 * for reporting (e.g. report supported_speeds). If you alter this list,
@@ -223,6 +223,7 @@ struct fc_vport {
223 u8 flags; 223 u8 flags;
224 struct list_head peers; 224 struct list_head peers;
225 struct device dev; 225 struct device dev;
226 struct work_struct vport_delete_work;
226} __attribute__((aligned(sizeof(unsigned long)))); 227} __attribute__((aligned(sizeof(unsigned long))));
227 228
228/* bit field values for struct fc_vport "flags" field: */ 229/* bit field values for struct fc_vport "flags" field: */
@@ -397,7 +398,7 @@ struct fc_host_statistics {
397 u64 prim_seq_protocol_err_count; 398 u64 prim_seq_protocol_err_count;
398 u64 invalid_tx_word_count; 399 u64 invalid_tx_word_count;
399 u64 invalid_crc_count; 400 u64 invalid_crc_count;
400 401
401 /* fc4 statistics (only FCP supported currently) */ 402 /* fc4 statistics (only FCP supported currently) */
402 u64 fcp_input_requests; 403 u64 fcp_input_requests;
403 u64 fcp_output_requests; 404 u64 fcp_output_requests;
@@ -592,11 +593,11 @@ struct fc_function_template {
592 u32 dd_fcrport_size; 593 u32 dd_fcrport_size;
593 u32 dd_fcvport_size; 594 u32 dd_fcvport_size;
594 595
595 /* 596 /*
596 * The driver sets these to tell the transport class it 597 * The driver sets these to tell the transport class it
597 * wants the attributes displayed in sysfs. If the show_ flag 598 * wants the attributes displayed in sysfs. If the show_ flag
598 * is not set, the attribute will be private to the transport 599 * is not set, the attribute will be private to the transport
599 * class 600 * class
600 */ 601 */
601 602
602 /* remote port fixed attributes */ 603 /* remote port fixed attributes */