diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2012-02-27 06:08:53 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-29 17:58:18 -0500 |
commit | 30534952743f73f1de3c6c056400d7249f5c7f75 (patch) | |
tree | c2a4dafebcff2ad4779f9e931be3d108bcef4844 | |
parent | 376738af500aca83bcdd78fb4c8c71a51b27f5a3 (diff) |
[SCSI] scsi_transport: Export CHAP index as sysfs attribute
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 8 | ||||
-rw-r--r-- | include/scsi/iscsi_if.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 7bf0dec46271..fac31730addf 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -2475,6 +2475,8 @@ iscsi_session_attr(username, ISCSI_PARAM_USERNAME, 1); | |||
2475 | iscsi_session_attr(username_in, ISCSI_PARAM_USERNAME_IN, 1); | 2475 | iscsi_session_attr(username_in, ISCSI_PARAM_USERNAME_IN, 1); |
2476 | iscsi_session_attr(password, ISCSI_PARAM_PASSWORD, 1); | 2476 | iscsi_session_attr(password, ISCSI_PARAM_PASSWORD, 1); |
2477 | iscsi_session_attr(password_in, ISCSI_PARAM_PASSWORD_IN, 1); | 2477 | iscsi_session_attr(password_in, ISCSI_PARAM_PASSWORD_IN, 1); |
2478 | iscsi_session_attr(chap_out_idx, ISCSI_PARAM_CHAP_OUT_IDX, 1); | ||
2479 | iscsi_session_attr(chap_in_idx, ISCSI_PARAM_CHAP_IN_IDX, 1); | ||
2478 | iscsi_session_attr(fast_abort, ISCSI_PARAM_FAST_ABORT, 0); | 2480 | iscsi_session_attr(fast_abort, ISCSI_PARAM_FAST_ABORT, 0); |
2479 | iscsi_session_attr(abort_tmo, ISCSI_PARAM_ABORT_TMO, 0); | 2481 | iscsi_session_attr(abort_tmo, ISCSI_PARAM_ABORT_TMO, 0); |
2480 | iscsi_session_attr(lu_reset_tmo, ISCSI_PARAM_LU_RESET_TMO, 0); | 2482 | iscsi_session_attr(lu_reset_tmo, ISCSI_PARAM_LU_RESET_TMO, 0); |
@@ -2571,6 +2573,8 @@ static struct attribute *iscsi_session_attrs[] = { | |||
2571 | &dev_attr_priv_sess_recovery_tmo.attr, | 2573 | &dev_attr_priv_sess_recovery_tmo.attr, |
2572 | &dev_attr_priv_sess_state.attr, | 2574 | &dev_attr_priv_sess_state.attr, |
2573 | &dev_attr_priv_sess_creator.attr, | 2575 | &dev_attr_priv_sess_creator.attr, |
2576 | &dev_attr_sess_chap_out_idx.attr, | ||
2577 | &dev_attr_sess_chap_in_idx.attr, | ||
2574 | NULL, | 2578 | NULL, |
2575 | }; | 2579 | }; |
2576 | 2580 | ||
@@ -2602,6 +2606,10 @@ static umode_t iscsi_session_attr_is_visible(struct kobject *kobj, | |||
2602 | param = ISCSI_PARAM_TARGET_NAME; | 2606 | param = ISCSI_PARAM_TARGET_NAME; |
2603 | else if (attr == &dev_attr_sess_tpgt.attr) | 2607 | else if (attr == &dev_attr_sess_tpgt.attr) |
2604 | param = ISCSI_PARAM_TPGT; | 2608 | param = ISCSI_PARAM_TPGT; |
2609 | else if (attr == &dev_attr_sess_chap_in_idx.attr) | ||
2610 | param = ISCSI_PARAM_CHAP_IN_IDX; | ||
2611 | else if (attr == &dev_attr_sess_chap_out_idx.attr) | ||
2612 | param = ISCSI_PARAM_CHAP_OUT_IDX; | ||
2605 | else if (attr == &dev_attr_sess_password.attr) | 2613 | else if (attr == &dev_attr_sess_password.attr) |
2606 | param = ISCSI_PARAM_USERNAME; | 2614 | param = ISCSI_PARAM_USERNAME; |
2607 | else if (attr == &dev_attr_sess_password_in.attr) | 2615 | else if (attr == &dev_attr_sess_password_in.attr) |
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index 228a8af05129..9c23ee8fd2d3 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
@@ -450,6 +450,9 @@ enum iscsi_param { | |||
450 | 450 | ||
451 | ISCSI_PARAM_TGT_RESET_TMO, | 451 | ISCSI_PARAM_TGT_RESET_TMO, |
452 | ISCSI_PARAM_TARGET_ALIAS, | 452 | ISCSI_PARAM_TARGET_ALIAS, |
453 | |||
454 | ISCSI_PARAM_CHAP_IN_IDX, | ||
455 | ISCSI_PARAM_CHAP_OUT_IDX, | ||
453 | /* must always be last */ | 456 | /* must always be last */ |
454 | ISCSI_PARAM_MAX, | 457 | ISCSI_PARAM_MAX, |
455 | }; | 458 | }; |