Merge pull request #119 from minwooim/for-fix-chrdev-to-generic

dwsuse · web-flow · commit 32cceae8957a · 2021-11-18T14:13:03.000+01:00
tree: rename namespace function name chrdev to generic
diff --git a/src/nvme/tree.c b/src/nvme/tree.c
@@ -1577,7 +1577,7 @@ static int nvme_ns_init(struct nvme_ns *n)
 	return 0;
 }
 
-static void nvme_ns_set_chrdev_name(struct nvme_ns *n, const char *name)
+static void nvme_ns_set_generic_name(struct nvme_ns *n, const char *name)
 {
 	char generic_name[PATH_MAX];
 	int instance, head_instance;
@@ -1606,7 +1606,7 @@ static nvme_ns_t nvme_ns_open(const char *name)
 	if (n->fd < 0)
 		goto free_ns;
 
-	nvme_ns_set_chrdev_name(n, name);
+	nvme_ns_set_generic_name(n, name);
 
 	if (nvme_get_nsid(n->fd, &n->nsid) < 0)
 		goto close_fd;

Original file line number	Diff line number	Diff line change
`@@ -1577,7 +1577,7 @@ static int nvme_ns_init(struct nvme_ns *n)`
`1577`	`1577`	`return 0;`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`		`-static void nvme_ns_set_chrdev_name(struct nvme_ns n, const char name)`
	`1580`	`+static void nvme_ns_set_generic_name(struct nvme_ns n, const char name)`
`1581`	`1581`	`{`
`1582`	`1582`	`char generic_name[PATH_MAX];`
`1583`	`1583`	`int instance, head_instance;`
`@@ -1606,7 +1606,7 @@ static nvme_ns_t nvme_ns_open(const char *name)`
`1606`	`1606`	`if (n->fd < 0)`
`1607`	`1607`	`goto free_ns;`
`1608`	`1608`
`1609`		`- nvme_ns_set_chrdev_name(n, name);`
	`1609`	`+ nvme_ns_set_generic_name(n, name);`
`1610`	`1610`
`1611`	`1611`	`if (nvme_get_nsid(n->fd, &n->nsid) < 0)`
`1612`	`1612`	`goto close_fd;`