Commit 447b167b authored by Li Zhijian's avatar Li Zhijian Committed by Ira Weiny
Browse files

nvdimm: Remove dead code for ENODEV checking in scan_labels() 



The only way create_namespace_pmem() returns an ENODEV code is if
select_pmem_id(nd_region, &uuid) returns ENODEV when its 2nd parameter
is a null pointer. However, this is impossible because &uuid is always
valid.

Furthermore, create_namespace_pmem() is the only user of
select_pmem_id(), it's safe to remove the 'return -ENODEV' branch.

Signed-off-by: default avatarLi Zhijian <lizhijian@fujitsu.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://patch.msgid.link/20240819062045.1481298-2-lizhijian@fujitsu.com


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent 62c2aa6b

drivers/nvdimm/namespace_devs.c

+0 −9
Original line number Diff line number Diff line
@@ -1612,9 +1612,6 @@ static int select_pmem_id(struct nd_region *nd_region, const uuid_t *pmem_id) 
{

	int i;



	if (!pmem_id)

		return -ENODEV;



	for (i = 0; i < nd_region->ndr_mappings; i++) {

		struct nd_mapping *nd_mapping = &nd_region->mapping[i];

		struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
@@ -1790,9 +1787,6 @@ static struct device *create_namespace_pmem(struct nd_region *nd_region, 
	case -EINVAL:

		dev_dbg(&nd_region->dev, "invalid label(s)\n");

		break;

	case -ENODEV:

		dev_dbg(&nd_region->dev, "label not found\n");

		break;

	default:

		dev_dbg(&nd_region->dev, "unexpected err: %d\n", rc);

		break;
@@ -1980,9 +1974,6 @@ static struct device **scan_labels(struct nd_region *nd_region) 
			case -EAGAIN:

				/* skip invalid labels */

				continue;

			case -ENODEV:

				/* fallthrough to seed creation */

				break;

			default:

				goto err;

			}