summaryrefslogtreecommitdiffstats
path: root/fs/openpromfs
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-11-16 15:06:52 -0600
committerDavid S. Miller <davem@davemloft.net>2018-11-18 13:35:19 -0800
commit105e996a8322079fa1aa2f40001eed6bbdbe10f9 (patch)
treec3382a10f9d2ccdf5326ea236c106233c50a16b0 /fs/openpromfs
parent25e19c1fe421280a47f37c3571aa379e6e67966c (diff)
downloadlinux-105e996a8322079fa1aa2f40001eed6bbdbe10f9.tar.bz2
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" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/openpromfs')
-rw-r--r--fs/openpromfs/inode.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/openpromfs/inode.c b/fs/openpromfs/inode.c
index 607092f367ad..3d8e9bcfe239 100644
--- a/fs/openpromfs/inode.c
+++ b/fs/openpromfs/inode.c
@@ -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;