diff options
Diffstat (limited to 'drivers/nvdimm/namespace_devs.c')
-rw-r--r-- | drivers/nvdimm/namespace_devs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c index cb322f2bc605..4a4266250c28 100644 --- a/drivers/nvdimm/namespace_devs.c +++ b/drivers/nvdimm/namespace_devs.c | |||
@@ -799,7 +799,7 @@ static int merge_dpa(struct nd_region *nd_region, | |||
799 | return 0; | 799 | return 0; |
800 | } | 800 | } |
801 | 801 | ||
802 | static int __reserve_free_pmem(struct device *dev, void *data) | 802 | int __reserve_free_pmem(struct device *dev, void *data) |
803 | { | 803 | { |
804 | struct nvdimm *nvdimm = data; | 804 | struct nvdimm *nvdimm = data; |
805 | struct nd_region *nd_region; | 805 | struct nd_region *nd_region; |
@@ -836,7 +836,7 @@ static int __reserve_free_pmem(struct device *dev, void *data) | |||
836 | return 0; | 836 | return 0; |
837 | } | 837 | } |
838 | 838 | ||
839 | static void release_free_pmem(struct nvdimm_bus *nvdimm_bus, | 839 | void release_free_pmem(struct nvdimm_bus *nvdimm_bus, |
840 | struct nd_mapping *nd_mapping) | 840 | struct nd_mapping *nd_mapping) |
841 | { | 841 | { |
842 | struct nvdimm_drvdata *ndd = to_ndd(nd_mapping); | 842 | struct nvdimm_drvdata *ndd = to_ndd(nd_mapping); |
@@ -1032,7 +1032,7 @@ static ssize_t __size_store(struct device *dev, unsigned long long val) | |||
1032 | 1032 | ||
1033 | allocated += nvdimm_allocated_dpa(ndd, &label_id); | 1033 | allocated += nvdimm_allocated_dpa(ndd, &label_id); |
1034 | } | 1034 | } |
1035 | available = nd_region_available_dpa(nd_region); | 1035 | available = nd_region_allocatable_dpa(nd_region); |
1036 | 1036 | ||
1037 | if (val > available + allocated) | 1037 | if (val > available + allocated) |
1038 | return -ENOSPC; | 1038 | return -ENOSPC; |