Ignore:
Timestamp:
Mar 15, 2017, 2:42:58 AM (4 months ago)
Author:
brainslayer
Message:

use new squashfs in all kernels

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/linux/universal/linux-4.9/drivers/nvdimm/namespace_devs.c

    r31574 r31662  
    17011701                struct nd_namespace_label *nd_label)
    17021702{
     1703        u64 altcookie = nd_region_interleave_set_altcookie(nd_region);
    17031704        u64 cookie = nd_region_interleave_set_cookie(nd_region);
    17041705        struct nd_label_ent *label_ent;
     
    17191720                dev_dbg(&nd_region->dev, "invalid cookie in label: %pUb\n",
    17201721                                nd_label->uuid);
    1721                 return ERR_PTR(-EAGAIN);
     1722                if (__le64_to_cpu(nd_label->isetcookie) != altcookie)
     1723                        return ERR_PTR(-EAGAIN);
     1724
     1725                dev_dbg(&nd_region->dev, "valid altcookie in label: %pUb\n",
     1726                                nd_label->uuid);
    17221727        }
    17231728
     
    17341739        res->flags = IORESOURCE_MEM;
    17351740
    1736         for (i = 0; i < nd_region->ndr_mappings; i++)
    1737                 if (!has_uuid_at_pos(nd_region, nd_label->uuid, cookie, i))
    1738                         break;
     1741        for (i = 0; i < nd_region->ndr_mappings; i++) {
     1742                if (has_uuid_at_pos(nd_region, nd_label->uuid, cookie, i))
     1743                        continue;
     1744                if (has_uuid_at_pos(nd_region, nd_label->uuid, altcookie, i))
     1745                        continue;
     1746                break;
     1747        }
     1748
    17391749        if (i < nd_region->ndr_mappings) {
    17401750                struct nvdimm_drvdata *ndd = to_ndd(&nd_region->mapping[i]);
Note: See TracChangeset for help on using the changeset viewer.