aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/label.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/nvdimm/label.c')
-rw-r--r--drivers/nvdimm/label.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index 235f2089fab2..922b68718a1a 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -21,6 +21,7 @@
21#include "nd.h" 21#include "nd.h"
22 22
23static guid_t nvdimm_btt_guid; 23static guid_t nvdimm_btt_guid;
24static guid_t nvdimm_btt2_guid;
24static guid_t nvdimm_pfn_guid; 25static guid_t nvdimm_pfn_guid;
25static guid_t nvdimm_dax_guid; 26static guid_t nvdimm_dax_guid;
26 27
@@ -578,6 +579,8 @@ enum nvdimm_claim_class to_nvdimm_cclass(guid_t *guid)
578{ 579{
579 if (guid_equal(guid, &nvdimm_btt_guid)) 580 if (guid_equal(guid, &nvdimm_btt_guid))
580 return NVDIMM_CCLASS_BTT; 581 return NVDIMM_CCLASS_BTT;
582 else if (guid_equal(guid, &nvdimm_btt2_guid))
583 return NVDIMM_CCLASS_BTT2;
581 else if (guid_equal(guid, &nvdimm_pfn_guid)) 584 else if (guid_equal(guid, &nvdimm_pfn_guid))
582 return NVDIMM_CCLASS_PFN; 585 return NVDIMM_CCLASS_PFN;
583 else if (guid_equal(guid, &nvdimm_dax_guid)) 586 else if (guid_equal(guid, &nvdimm_dax_guid))
@@ -593,6 +596,8 @@ static const guid_t *to_abstraction_guid(enum nvdimm_claim_class claim_class,
593{ 596{
594 if (claim_class == NVDIMM_CCLASS_BTT) 597 if (claim_class == NVDIMM_CCLASS_BTT)
595 return &nvdimm_btt_guid; 598 return &nvdimm_btt_guid;
599 else if (claim_class == NVDIMM_CCLASS_BTT2)
600 return &nvdimm_btt2_guid;
596 else if (claim_class == NVDIMM_CCLASS_PFN) 601 else if (claim_class == NVDIMM_CCLASS_PFN)
597 return &nvdimm_pfn_guid; 602 return &nvdimm_pfn_guid;
598 else if (claim_class == NVDIMM_CCLASS_DAX) 603 else if (claim_class == NVDIMM_CCLASS_DAX)
@@ -1158,6 +1163,7 @@ int nd_blk_namespace_label_update(struct nd_region *nd_region,
1158int __init nd_label_init(void) 1163int __init nd_label_init(void)
1159{ 1164{
1160 WARN_ON(guid_parse(NVDIMM_BTT_GUID, &nvdimm_btt_guid)); 1165 WARN_ON(guid_parse(NVDIMM_BTT_GUID, &nvdimm_btt_guid));
1166 WARN_ON(guid_parse(NVDIMM_BTT2_GUID, &nvdimm_btt2_guid));
1161 WARN_ON(guid_parse(NVDIMM_PFN_GUID, &nvdimm_pfn_guid)); 1167 WARN_ON(guid_parse(NVDIMM_PFN_GUID, &nvdimm_pfn_guid));
1162 WARN_ON(guid_parse(NVDIMM_DAX_GUID, &nvdimm_dax_guid)); 1168 WARN_ON(guid_parse(NVDIMM_DAX_GUID, &nvdimm_dax_guid));
1163 1169