Skip to content

Commit

Permalink
fs/openpromfs: use full_name instead of path_component_name
Browse files Browse the repository at this point in the history
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]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
robherring authored and davem330 committed Nov 18, 2018
1 parent 25e19c1 commit 105e996
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions fs/openpromfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 105e996

Please sign in to comment.