Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45200838 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm 

Pull libnvdimm fix from Dan Williams:
 "A minor fix for the libnvdimm subsystem.

  This is not critical.  The problem can be worked around in userspace
  by putting the namespace temporarily into raw mode
  (ndctl_namespace_set_raw_mode() from libndctl), but that is awkward
  for management utilities.

* 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm:
  libnvdimm: fix namespace seed creation
parents aca105a6 8ca24353

drivers/nvdimm/region_devs.c

+5 −0
Original line number Diff line number Diff line
@@ -458,10 +458,15 @@ static void nd_region_notify_driver_action(struct nvdimm_bus *nvdimm_bus, 
		nvdimm_bus_unlock(dev);

	}

	if (is_nd_btt(dev) && probe) {

		struct nd_btt *nd_btt = to_nd_btt(dev);



		nd_region = to_nd_region(dev->parent);

		nvdimm_bus_lock(dev);

		if (nd_region->btt_seed == dev)

			nd_region_create_btt_seed(nd_region);

		if (nd_region->ns_seed == &nd_btt->ndns->dev &&

				is_nd_blk(dev->parent))

			nd_region_create_blk_seed(nd_region);

		nvdimm_bus_unlock(dev);

	}

}