mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
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>
This commit is contained in:
parent
25e19c1fe4
commit
105e996a83
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user