fs/openpromfs: use full_name instead of path_component_name

PATCH New Rob Herring 1 participant 1 message Nov 16, 2018

Share & tools

Rob Herring

author

2018-11-16 21:06 UTC #0 lore raw

PATCH v2 1/10 fs/openpromfs: use full_name instead of path_component_name

In preparation to remove struct device_node.path_component_name, use full_name instead. kbasename is used so full_name can be used whether it is the full path or just the node's name and unit-address.

Cc "David S. Miller" <[email protected]>

Cc [email protected]

Signed-off-by Rob Herring <[email protected]>

---
 fs/openpromfs/inode.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

fs/openpromfs/inode.c +5 -4

index 607092f367ad..3d8e9bcfe239 100644
@@ -199,10 +199,11 @@ static struct dentry *openpromfs_lookup(struct inode *dir, struct dentry *dentry
 
 	child = dp->child;
 	while (child) {
-		int n = strlen(child->path_component_name);
+		const char *node_name = kbasename(child->full_name);
+		int n = strlen(node_name);
 
 		if (len = n &&
-		    !strncmp(child->path_component_name, name, len)) {
+		    !strncmp(node_name, name, len)) {
 			ent_type = op_inode_node;
 			ent_data.node = child;
 			ino = child->unique_id;

@@ -293,8 +294,8 @@ static int openpromfs_readdir(struct file *file, struct dir_context *ctx)
 	}
 	while (child) {
 		if (!dir_emit(ctx,
-			    child->path_component_name,
-			    strlen(child->path_component_name),
+			    kbasename(child->full_name),
+			    strlen(kbasename(child->full_name)),
 			    child->unique_id, DT_DIR))
 			goto out;

Signature · 1 line

2.19.1