From: Rob Herring <robh@kernel.org>
To: "David S. Miller" <davem@davemloft.net>
Cc: Frank Rowand <frowand.list@gmail.com>,
linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org
Subject: [PATCH 1/8] fs/openpromfs: use full_name instead of path_component_name
Date: Wed, 7 Nov 2018 16:31:44 -0600 [thread overview]
Message-ID: <20181107223151.14991-2-robh@kernel.org> (raw)
In-Reply-To: <20181107223151.14991-1-robh@kernel.org>
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>
---
fs/openpromfs/inode.c | 9 +++++----
1 file 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;
--
2.19.1
next prev parent reply other threads:[~2018-11-07 22:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 22:31 [PATCH 0/8] sparc: OF name and device_type rework Rob Herring
2018-11-07 22:31 ` Rob Herring [this message]
2018-11-07 22:31 ` [PATCH 2/8] of: Drop full path from Sparc PDT full_name Rob Herring
2018-11-09 3:11 ` David Miller
2018-11-09 20:30 ` Rob Herring
2018-11-10 4:36 ` David Miller
2018-11-07 22:31 ` [PATCH 3/8] sparc: prom: use property "name" directly to construct node names Rob Herring
2018-11-09 3:13 ` David Miller
2018-11-09 13:02 ` Rob Herring
2018-11-10 0:32 ` David Miller
2018-11-07 22:31 ` [PATCH 4/8] sparc: Convert to using %pOF instead of full_name Rob Herring
2018-11-07 22:31 ` [PATCH 5/8] sparc: Convert to using %pOFn instead of device_node.name Rob Herring
2018-11-07 22:31 ` [PATCH 6/8] sparc: Use of_node_name_eq for node name comparisons Rob Herring
2018-11-07 22:31 ` [PATCH 7/8] sparc: Remove unused leon_trans_init Rob Herring
2018-11-07 22:31 ` [PATCH 8/8] sparc: Use device_type helpers to access the node type Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181107223151.14991-2-robh@kernel.org \
--to=robh@kernel.org \
--cc=davem@davemloft.net \
--cc=frowand.list@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sparclinux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).