Commit 53fc5951 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Dan Williams
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220607153750.33639-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 36a40c37

drivers/nvdimm/namespace_devs.c

+4 −9
Original line number Diff line number Diff line
@@ -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);