nvdimm/namespace: drop unneeded temporary variable in size_store()
PATCH 1/1 nvdimm/namespace: drop unneeded temporary variable in size_store()
Refactor size_store() in order to remove temporary variable on stack by joining conditionals.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/nvdimm/namespace_devs.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/nvdimm/namespace_devs.c +4 -9
@@ -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);
Signature · 1 line
2.35.1
Quoted 2 lines · Andy Shevchenko
Refactor
size_store()in order to remove temporary variable on stack by joining conditionals.
Looks good, applied.