Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95591bd0 authored May 17, 2018 by Bowgo Tsai

Removing block device by-num symlinks

The uevent.partition_num easily collides between partitions, for
example:

  Both /dev/block/sda3 and /dev/block/sdd3 will generate the same symlink:
    /dev/block/platform/soc/1da4000.ufshc/by-num/p3

This change remove those by-num symlinks as there seems no effective
user of it.

Bug: 78613232
Test: m init_tests && \
      adb push $OUT/data/nativetest64/init_tests/init_tests /data/. && \
      adb shell /data/init_tests

Change-Id: I8dfa8dc1a2f9fc9296aa30f33e905bf158b501de

parent 93e45016

init/devices.cpp

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -331,10 +331,6 @@ std::vector<std::string> DeviceHandler::GetBlockDeviceSymlinks(const Uevent& uev
	links.emplace_back(link_path + "/by-name/" + partition_name_sanitized);		links.emplace_back(link_path + "/by-name/" + partition_name_sanitized);
	}		}

	if (uevent.partition_num >= 0) {
	links.emplace_back(link_path + "/by-num/p" + std::to_string(uevent.partition_num));
	}

	auto last_slash = uevent.path.rfind('/');		auto last_slash = uevent.path.rfind('/');
	links.emplace_back(link_path + "/" + uevent.path.substr(last_slash + 1));		links.emplace_back(link_path + "/" + uevent.path.substr(last_slash + 1));

init/devices_test.cpp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,6 @@ TEST(device_handler, get_block_device_symlinks_success_platform_with_partition)
	};		};
	std::vector<std::string> expected_result{		std::vector<std::string> expected_result{
	"/dev/block/platform/soc.0/f9824900.sdhci/by-name/modem",		"/dev/block/platform/soc.0/f9824900.sdhci/by-name/modem",
	"/dev/block/platform/soc.0/f9824900.sdhci/by-num/p1",
	"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",		"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",
	};		};

	@@ -100,7 +99,6 @@ TEST(device_handler, get_block_device_symlinks_success_platform_with_partition_o
	.partition_num = 1,		.partition_num = 1,
	};		};
	std::vector<std::string> expected_result{		std::vector<std::string> expected_result{
	"/dev/block/platform/soc.0/f9824900.sdhci/by-num/p1",
	"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",		"/dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1",
	};		};

init/init_first_stage.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -468,7 +468,6 @@ ListenerAction FirstStageMountVBootV2::UeventCallback(const Uevent& uevent) {
	// the content of uevent. by-name symlink will be at [0] if uevent->partition_name		// the content of uevent. by-name symlink will be at [0] if uevent->partition_name
	// is not empty. e.g.,		// is not empty. e.g.,
	// - /dev/block/platform/soc.0/f9824900.sdhci/by-name/modem		// - /dev/block/platform/soc.0/f9824900.sdhci/by-name/modem
	// - /dev/block/platform/soc.0/f9824900.sdhci/by-num/p1
	// - /dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1		// - /dev/block/platform/soc.0/f9824900.sdhci/mmcblk0p1
	std::vector<std::string> links = device_handler_.GetBlockDeviceSymlinks(uevent);		std::vector<std::string> links = device_handler_.GetBlockDeviceSymlinks(uevent);
	if (!links.empty()) {		if (!links.empty()) {