Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 105e996a authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

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: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25e19c1f

fs/openpromfs/inode.c

+5 −4
Original line number Diff line number Diff line
@@ -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;