* [PATCH v1 1/1] nvdimm/namespace: drop unneeded temporary variable in size_store()
@ 2022-06-07 15:37 Andy Shevchenko
2022-07-14 18:28 ` Dan Williams
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2022-06-07 15:37 UTC (permalink / raw)
To: Dan Williams, nvdimm, linux-kernel
Cc: Vishal Verma, Dave Jiang, Ira Weiny, Andy Shevchenko
Refactor size_store() in order to remove temporary variable on stack
by joining conditionals.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/nvdimm/namespace_devs.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/nvdimm/namespace_devs.c b/drivers/nvdimm/namespace_devs.c
index 3dae17c90e8c..0f863fda56e6 100644
--- a/drivers/nvdimm/namespace_devs.c
+++ b/drivers/nvdimm/namespace_devs.c
@@ -836,7 +836,6 @@ static ssize_t size_store(struct device *dev,
{
struct nd_region *nd_region = to_nd_region(dev->parent);
unsigned long long val;
- uuid_t **uuid = NULL;
int rc;
rc = kstrtoull(buf, 0, &val);
@@ -850,16 +849,12 @@ static ssize_t size_store(struct device *dev,
if (rc >= 0)
rc = nd_namespace_label_update(nd_region, dev);
- if (is_namespace_pmem(dev)) {
+ /* setting size zero == 'delete namespace' */
+ if (rc == 0 && val == 0 && is_namespace_pmem(dev)) {
struct nd_namespace_pmem *nspm = to_nd_namespace_pmem(dev);
- uuid = &nspm->uuid;
- }
-
- if (rc == 0 && val == 0 && uuid) {
- /* setting size zero == 'delete namespace' */
- kfree(*uuid);
- *uuid = NULL;
+ kfree(nspm->uuid);
+ nspm->uuid = NULL;
}
dev_dbg(dev, "%llx %s (%d)\n", val, rc < 0 ? "fail" : "success", rc);
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH v1 1/1] nvdimm/namespace: drop unneeded temporary variable in size_store()
2022-06-07 15:37 [PATCH v1 1/1] nvdimm/namespace: drop unneeded temporary variable in size_store() Andy Shevchenko
@ 2022-07-14 18:28 ` Dan Williams
0 siblings, 0 replies; 2+ messages in thread
From: Dan Williams @ 2022-07-14 18:28 UTC (permalink / raw)
To: Andy Shevchenko, Dan Williams, nvdimm, linux-kernel
Cc: Vishal Verma, Dave Jiang, Ira Weiny, Andy Shevchenko
Andy Shevchenko wrote:
> Refactor size_store() in order to remove temporary variable on stack
> by joining conditionals.
Looks good, applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-14 18:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-07 15:37 [PATCH v1 1/1] nvdimm/namespace: drop unneeded temporary variable in size_store() Andy Shevchenko
2022-07-14 18:28 ` Dan Williams
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox