diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 14:36:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-25 14:36:12 -0400 |
| commit | 4520083852a60cbdb9adc235b94c8f36c177427d (patch) | |
| tree | 433ad11cbdbf15384c850ad9da1346c1665da41c | |
| parent | aca105a697bf08208909225a66198277e51b4f65 (diff) | |
| parent | 8ca243536d21ae2d08f61b1c5af4ac3d4bb697e4 (diff) | |
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
| -rw-r--r-- | drivers/nvdimm/region_devs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index a5233422f9dc..7384455792bf 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c | |||
| @@ -458,10 +458,15 @@ static void nd_region_notify_driver_action(struct nvdimm_bus *nvdimm_bus, | |||
| 458 | nvdimm_bus_unlock(dev); | 458 | nvdimm_bus_unlock(dev); |
| 459 | } | 459 | } |
| 460 | if (is_nd_btt(dev) && probe) { | 460 | if (is_nd_btt(dev) && probe) { |
| 461 | struct nd_btt *nd_btt = to_nd_btt(dev); | ||
| 462 | |||
| 461 | nd_region = to_nd_region(dev->parent); | 463 | nd_region = to_nd_region(dev->parent); |
| 462 | nvdimm_bus_lock(dev); | 464 | nvdimm_bus_lock(dev); |
| 463 | if (nd_region->btt_seed == dev) | 465 | if (nd_region->btt_seed == dev) |
| 464 | nd_region_create_btt_seed(nd_region); | 466 | nd_region_create_btt_seed(nd_region); |
| 467 | if (nd_region->ns_seed == &nd_btt->ndns->dev && | ||
| 468 | is_nd_blk(dev->parent)) | ||
| 469 | nd_region_create_blk_seed(nd_region); | ||
| 465 | nvdimm_bus_unlock(dev); | 470 | nvdimm_bus_unlock(dev); |
| 466 | } | 471 | } |
| 467 | } | 472 | } |
