Skip to contentSkip to conversation

namei: use QSTR() instead of QSTR_INIT() in path_pts

PATCH RESEND Applied Thorsten Blum 2 participants 2 messages May 5 – May 12 VFS

lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 namei: use QSTR() instead of QSTR_INIT() in path_pts

Drop the hard-coded length argument and use the simpler QSTR(). Inline the code and drop the local variable.

---
Changes in v2:
- Inline QSTR() and drop the local variable as suggested by Al Viro
- v1: https://lore.kernel.org/lkml/[email protected]/

---
 fs/namei.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/namei.c +1 -2
index c7fac83c9a85..01f3fbdf646c 100644
@@ -3617,7 +3617,6 @@ int path_pts(struct path *path)
 	 */
 	struct dentry *parent = dget_parent(path->dentry);
 	struct dentry *child;
-	struct qstr this = QSTR_INIT("pts", 3);
 
 	if (unlikely(!path_connected(path->mnt, parent))) {
 		dput(parent);
@@ -3625,7 +3624,7 @@ int path_pts(struct path *path)
 	}
 	dput(path->dentry);
 	path->dentry = parent;
-	child = d_hash_and_lookup(parent, &this);
+	child = d_hash_and_lookup(parent, &QSTR("pts"));
 	if (IS_ERR_OR_NULL(child))
 		return -ENOENT;
 
maintainer Applied
#1 lore raw
Quoted 2 lines · Thorsten Blum

Drop the hard-coded length argument and use the simpler QSTR(). Inline the code and drop the local variable.

Applied to the vfs-7.2.misc branch of the vfs/vfs.git tree. Patches in the vfs-7.2.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs-7.2.misc

[1/1] namei: use QSTR() instead of QSTR_INIT() in path_pts

      https://git.kernel.org/vfs/vfs/c/24c62d29e9f0