4 files changed, 59 insertions, 38 deletions

diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
index 1242c7c04a01..000294a9df80 100644
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -105,25 +105,7 @@ static struct iscsi_transport cxgb3i_iscsi_transport = {
         .caps           = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST
                                 | CAP_DATADGST | CAP_DIGEST_OFFLOAD |
                                 CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO,
-        .param_mask     = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH |
-                                ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN |
-                                ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T |
-                                ISCSI_IMM_DATA_EN | ISCSI_FIRST_BURST |
-                                ISCSI_MAX_BURST | ISCSI_PDU_INORDER_EN |
-                                ISCSI_DATASEQ_INORDER_EN | ISCSI_ERL |
-                                ISCSI_CONN_PORT | ISCSI_CONN_ADDRESS |
-                                ISCSI_EXP_STATSN | ISCSI_PERSISTENT_PORT |
-                                ISCSI_PERSISTENT_ADDRESS |
-                                ISCSI_TARGET_NAME | ISCSI_TPGT |
-                                ISCSI_USERNAME | ISCSI_PASSWORD |
-                                ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |
-                                ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |
-                                ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |
-                                ISCSI_PING_TMO | ISCSI_RECV_TMO |
-                                ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,
-        .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
-                                ISCSI_HOST_INITIATOR_NAME |
-                                ISCSI_HOST_NETDEV_NAME,
+        .attr_is_visible        = cxgbi_attr_is_visible,
         .get_host_param = cxgbi_get_host_param,
         .set_host_param = cxgbi_set_host_param,
         /* session management */
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
index 31c79bde6976..ac7a9b1e3e23 100644
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -106,25 +106,7 @@ static struct iscsi_transport cxgb4i_iscsi_transport = {
         .caps           = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST |
                                 CAP_DATADGST | CAP_DIGEST_OFFLOAD |
                                 CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO,
-        .param_mask     = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH |
-                                ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN |
-                                ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T |
-                                ISCSI_IMM_DATA_EN | ISCSI_FIRST_BURST |
-                                ISCSI_MAX_BURST | ISCSI_PDU_INORDER_EN |
-                                ISCSI_DATASEQ_INORDER_EN | ISCSI_ERL |
-                                ISCSI_CONN_PORT | ISCSI_CONN_ADDRESS |
-                                ISCSI_EXP_STATSN | ISCSI_PERSISTENT_PORT |
-                                ISCSI_PERSISTENT_ADDRESS |
-                                ISCSI_TARGET_NAME | ISCSI_TPGT |
-                                ISCSI_USERNAME | ISCSI_PASSWORD |
-                                ISCSI_USERNAME_IN | ISCSI_PASSWORD_IN |
-                                ISCSI_FAST_ABORT | ISCSI_ABORT_TMO |
-                                ISCSI_LU_RESET_TMO | ISCSI_TGT_RESET_TMO |
-                                ISCSI_PING_TMO | ISCSI_RECV_TMO |
-                                ISCSI_IFACE_NAME | ISCSI_INITIATOR_NAME,
-        .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
-                                ISCSI_HOST_INITIATOR_NAME |
-                                ISCSI_HOST_NETDEV_NAME,
+        .attr_is_visible        = cxgbi_attr_is_visible,
         .get_host_param = cxgbi_get_host_param,
         .set_host_param = cxgbi_set_host_param,
         /* session management */
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 1c1329bc77c7..c363a4b260fd 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -2568,6 +2568,62 @@ void cxgbi_iscsi_cleanup(struct iscsi_transport *itp,
 }
 EXPORT_SYMBOL_GPL(cxgbi_iscsi_cleanup);
 
+mode_t cxgbi_attr_is_visible(int param_type, int param)
+{
+        switch (param_type) {
+        case ISCSI_HOST_PARAM:
+                switch (param) {
+                case ISCSI_HOST_PARAM_NETDEV_NAME:
+                case ISCSI_HOST_PARAM_HWADDRESS:
+                case ISCSI_HOST_PARAM_IPADDRESS:
+                case ISCSI_HOST_PARAM_INITIATOR_NAME:
+                        return S_IRUGO;
+                default:
+                        return 0;
+                }
+        case ISCSI_PARAM:
+                switch (param) {
+                case ISCSI_PARAM_MAX_RECV_DLENGTH:
+                case ISCSI_PARAM_MAX_XMIT_DLENGTH:
+                case ISCSI_PARAM_HDRDGST_EN:
+                case ISCSI_PARAM_DATADGST_EN:
+                case ISCSI_PARAM_CONN_ADDRESS:
+                case ISCSI_PARAM_CONN_PORT:
+                case ISCSI_PARAM_EXP_STATSN:
+                case ISCSI_PARAM_PERSISTENT_ADDRESS:
+                case ISCSI_PARAM_PERSISTENT_PORT:
+                case ISCSI_PARAM_PING_TMO:
+                case ISCSI_PARAM_RECV_TMO:
+                case ISCSI_PARAM_INITIAL_R2T_EN:
+                case ISCSI_PARAM_MAX_R2T:
+                case ISCSI_PARAM_IMM_DATA_EN:
+                case ISCSI_PARAM_FIRST_BURST:
+                case ISCSI_PARAM_MAX_BURST:
+                case ISCSI_PARAM_PDU_INORDER_EN:
+                case ISCSI_PARAM_DATASEQ_INORDER_EN:
+                case ISCSI_PARAM_ERL:
+                case ISCSI_PARAM_TARGET_NAME:
+                case ISCSI_PARAM_TPGT:
+                case ISCSI_PARAM_USERNAME:
+                case ISCSI_PARAM_PASSWORD:
+                case ISCSI_PARAM_USERNAME_IN:
+                case ISCSI_PARAM_PASSWORD_IN:
+                case ISCSI_PARAM_FAST_ABORT:
+                case ISCSI_PARAM_ABORT_TMO:
+                case ISCSI_PARAM_LU_RESET_TMO:
+                case ISCSI_PARAM_TGT_RESET_TMO:
+                case ISCSI_PARAM_IFACE_NAME:
+                case ISCSI_PARAM_INITIATOR_NAME:
+                        return S_IRUGO;
+                default:
+                        return 0;
+                }
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(cxgbi_attr_is_visible);
+
 static int __init libcxgbi_init_module(void)
 {
         sw_tag_idx_bits = (__ilog2_u32(ISCSI_ITT_MASK)) + 1;
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 3a25b1187c10..20c88279c7a6 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -709,6 +709,7 @@ int cxgbi_conn_xmit_pdu(struct iscsi_task *);
 
 void cxgbi_cleanup_task(struct iscsi_task *task);
 
+mode_t cxgbi_attr_is_visible(int param_type, int param);
 void cxgbi_get_conn_stats(struct iscsi_cls_conn *, struct iscsi_stats *);
 int cxgbi_set_conn_param(struct iscsi_cls_conn *,
                         enum iscsi_param, char *, int);