leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libnvdimm: rename nd_sector_size_{show,store} to nd_size_select_{show,store}

Browse Source 
Prepare for other another consumer of this size selection scheme that is
not a 'sector size'.

Cc: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2017-08-11 17:36:54 -07:00
parent dcb79b1544
commit b2c48f9f95
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvdimm/btt_devs.c
View File

@ -61,7 +61,7 @@ static ssize_t sector_size_show(struct device *dev,
{ {
struct nd_btt *nd_btt = to_nd_btt(dev); struct nd_btt *nd_btt = to_nd_btt(dev);
return nd_sector_size_show(nd_btt->lbasize, btt_lbasize_supported, buf); return nd_size_select_show(nd_btt->lbasize, btt_lbasize_supported, buf);
} }
static ssize_t sector_size_store(struct device *dev, static ssize_t sector_size_store(struct device *dev,
@ -72,7 +72,7 @@ static ssize_t sector_size_store(struct device *dev,
device_lock(dev); device_lock(dev);
nvdimm_bus_lock(dev); nvdimm_bus_lock(dev);
rc = nd_sector_size_store(dev, buf, &nd_btt->lbasize, rc = nd_size_select_store(dev, buf, &nd_btt->lbasize,
btt_lbasize_supported); btt_lbasize_supported);
dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__, dev_dbg(dev, "%s: result: %zd wrote: %s%s", __func__,
rc, buf, buf[len - 1] == '\n' ? "" : "\n"); rc, buf, buf[len - 1] == '\n' ? "" : "\n");

10
drivers/nvdimm/core.c
View File

@ -277,14 +277,14 @@ int nd_uuid_store(struct device *dev, u8 **uuid_out, const char *buf,
return 0; return 0;
} }
ssize_t nd_sector_size_show(unsigned long current_lbasize, ssize_t nd_size_select_show(unsigned long current_size,
const unsigned long *supported, char *buf) const unsigned long *supported, char *buf)
{ {
ssize_t len = 0; ssize_t len = 0;
int i; int i;
for (i = 0; supported[i]; i++) for (i = 0; supported[i]; i++)
if (current_lbasize == supported[i]) if (current_size == supported[i])
len += sprintf(buf + len, "[%ld] ", supported[i]); len += sprintf(buf + len, "[%ld] ", supported[i]);
else else
len += sprintf(buf + len, "%ld ", supported[i]); len += sprintf(buf + len, "%ld ", supported[i]);
@ -292,8 +292,8 @@ ssize_t nd_sector_size_show(unsigned long current_lbasize,
return len; return len;
} }
ssize_t nd_sector_size_store(struct device *dev, const char *buf, ssize_t nd_size_select_store(struct device *dev, const char *buf,
unsigned long *current_lbasize, const unsigned long *supported) unsigned long *current_size, const unsigned long *supported)
{ {
unsigned long lbasize; unsigned long lbasize;
int rc, i; int rc, i;
@ -310,7 +310,7 @@ ssize_t nd_sector_size_store(struct device *dev, const char *buf,
break; break;
if (supported[i]) { if (supported[i]) {
*current_lbasize = lbasize; *current_size = lbasize;
return 0; return 0;
} else { } else {
return -EINVAL; return -EINVAL;

6
drivers/nvdimm/namespace_devs.c
View File

@ -1313,14 +1313,14 @@ static ssize_t sector_size_show(struct device *dev,
if (is_namespace_blk(dev)) { if (is_namespace_blk(dev)) {
struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev); struct nd_namespace_blk *nsblk = to_nd_namespace_blk(dev);
return nd_sector_size_show(nsblk->lbasize, return nd_size_select_show(nsblk->lbasize,
blk_lbasize_supported, buf); blk_lbasize_supported, buf);
} }
if (is_namespace_pmem(dev)) { if (is_namespace_pmem(dev)) {
struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev); struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
return nd_sector_size_show(nspm->lbasize, return nd_size_select_show(nspm->lbasize,
pmem_lbasize_supported, buf); pmem_lbasize_supported, buf);
} }
return -ENXIO; return -ENXIO;
@ -1352,7 +1352,7 @@ static ssize_t sector_size_store(struct device *dev,
if (to_ndns(dev)->claim) if (to_ndns(dev)->claim)
rc = -EBUSY; rc = -EBUSY;
if (rc >= 0) if (rc >= 0)
rc = nd_sector_size_store(dev, buf, lbasize, supported); rc = nd_size_select_store(dev, buf, lbasize, supported);
if (rc >= 0) if (rc >= 0)
rc = nd_namespace_label_update(nd_region, dev); rc = nd_namespace_label_update(nd_region, dev);
dev_dbg(dev, "%s: result: %zd %s: %s%s", __func__, dev_dbg(dev, "%s: result: %zd %s: %s%s", __func__,

6
drivers/nvdimm/nd.h
View File

@ -234,10 +234,10 @@ void nd_device_unregister(struct device *dev, enum nd_async_mode mode);
void nd_device_notify(struct device *dev, enum nvdimm_event event); void nd_device_notify(struct device *dev, enum nvdimm_event event);
int nd_uuid_store(struct device *dev, u8 **uuid_out, const char *buf, int nd_uuid_store(struct device *dev, u8 **uuid_out, const char *buf,
size_t len); size_t len);
ssize_t nd_sector_size_show(unsigned long current_lbasize, ssize_t nd_size_select_show(unsigned long current_size,
const unsigned long *supported, char *buf); const unsigned long *supported, char *buf);
ssize_t nd_sector_size_store(struct device *dev, const char *buf, ssize_t nd_size_select_store(struct device *dev, const char *buf,
unsigned long *current_lbasize, const unsigned long *supported); unsigned long *current_size, const unsigned long *supported);
int __init nvdimm_init(void); int __init nvdimm_init(void);
int __init nd_region_init(void); int __init nd_region_init(void);
int __init nd_label_init(void); int __init nd_label_init(void);