2 files changed, 8 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 685b997306cf..625f4a664d06 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -295,6 +295,7 @@ static int fc_host_setup(struct transport_container *tc, struct device *dev,
          */
         fc_host_node_name(shost) = -1;
         fc_host_port_name(shost) = -1;
+        fc_host_permanent_port_name(shost) = -1;
         fc_host_supported_classes(shost) = FC_COS_UNSPECIFIED;
         memset(fc_host_supported_fc4s(shost), 0,
                 sizeof(fc_host_supported_fc4s(shost)));
@@ -795,6 +796,8 @@ static FC_CLASS_DEVICE_ATTR(host, supported_speeds, S_IRUGO,
 
 fc_private_host_rd_attr_cast(node_name, "0x%llx\n", 20, unsigned long long);
 fc_private_host_rd_attr_cast(port_name, "0x%llx\n", 20, unsigned long long);
+fc_private_host_rd_attr_cast(permanent_port_name, "0x%llx\n", 20,
+                             unsigned long long);
 fc_private_host_rd_attr(symbolic_name, "%s\n", (FC_SYMBOLIC_NAME_SIZE +1));
 fc_private_host_rd_attr(maxframe_size, "%u bytes\n", 20);
 fc_private_host_rd_attr(serial_number, "%s\n", (FC_SERIAL_NUMBER_SIZE +1));
@@ -1160,6 +1163,7 @@ fc_attach_transport(struct fc_function_template *ft)
         count=0;
         SETUP_HOST_ATTRIBUTE_RD(node_name);
         SETUP_HOST_ATTRIBUTE_RD(port_name);
+        SETUP_HOST_ATTRIBUTE_RD(permanent_port_name);
         SETUP_HOST_ATTRIBUTE_RD(supported_classes);
         SETUP_HOST_ATTRIBUTE_RD(supported_fc4s);
         SETUP_HOST_ATTRIBUTE_RD(symbolic_name);
diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 394f14a5b7cb..cf3fec8be1e3 100644
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -303,6 +303,7 @@ struct fc_host_attrs {
         /* Fixed Attributes */
         u64 node_name;
         u64 port_name;
+        u64 permanent_port_name;
         u32 supported_classes;
         u8  supported_fc4s[FC_FC4_LIST_SIZE];
         char symbolic_name[FC_SYMBOLIC_NAME_SIZE];
@@ -338,6 +339,8 @@ struct fc_host_attrs {
         (((struct fc_host_attrs *)(x)->shost_data)->node_name)
 #define fc_host_port_name(x)    \
         (((struct fc_host_attrs *)(x)->shost_data)->port_name)
+#define fc_host_permanent_port_name(x)  \
+        (((struct fc_host_attrs *)(x)->shost_data)->permanent_port_name)
 #define fc_host_supported_classes(x)    \
         (((struct fc_host_attrs *)(x)->shost_data)->supported_classes)
 #define fc_host_supported_fc4s(x)       \
@@ -426,6 +429,7 @@ struct fc_function_template {
         /* host fixed attributes */
         unsigned long   show_host_node_name:1;
         unsigned long   show_host_port_name:1;
+        unsigned long   show_host_permanent_port_name:1;
         unsigned long   show_host_supported_classes:1;
         unsigned long   show_host_supported_fc4s:1;
         unsigned long   show_host_symbolic_name:1;