On Wed, 30 Jul 2025 17:41:56 +0530 Neeraj Kumar <s.nee...@samsung.com> wrote:
> nd_mapping->labels maintains the list of labels present into LSA. > init_labels() prepares this list while adding new label into LSA > and updates nd_mapping->labels accordingly. During cxl region > creation nd_mapping->labels list and LSA was updated with one > region label. Therefore during new namespace label creation > pre-include the previously created region label, so increase > num_labels count by 1. > > Also updated nsl_set_region_uuid with region uuid with which > namespace is associated with. Any reason these are in the same patch? I'd like to have seen a bit more on why this 'Also' change is here and a separate patch might make that easier to see. > > Signed-off-by: Neeraj Kumar <s.nee...@samsung.com> > --- > drivers/nvdimm/label.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c > index be18278d6cea..fd02b557612e 100644 > --- a/drivers/nvdimm/label.c > +++ b/drivers/nvdimm/label.c > @@ -957,7 +957,7 @@ static int __pmem_label_update(struct nd_region > *nd_region, > nsl_set_slot(ndd, nd_label, slot); > nsl_set_alignment(ndd, nd_label, 0); > nsl_set_type_guid(ndd, nd_label, &nd_set->type_guid); > - nsl_set_region_uuid(ndd, nd_label, NULL); > + nsl_set_region_uuid(ndd, nd_label, &nd_set->uuid); > nsl_set_claim_class(ndd, nd_label, ndns->claim_class); > nsl_calculate_checksum(ndd, nd_label); > nd_dbg_dpa(nd_region, ndd, res, "\n"); > @@ -1129,7 +1129,8 @@ int nd_pmem_namespace_label_update(struct nd_region > *nd_region, > count++; > WARN_ON_ONCE(!count); > > - rc = init_labels(nd_mapping, count); > + /* Adding 1 to pre include the already added region label */ > + rc = init_labels(nd_mapping, count + 1); > if (rc < 0) > return rc; >
