diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2026-01-06 23:26:43 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2026-01-16 12:48:16 -0500 |
| commit | da72b76aaeaa2bc67ccedd6e539fabc04aff3ecd (patch) | |
| tree | e4550452a10b692bbbe29f44dbb5419175529d48 /fs | |
| parent | 037193b0ae833c922881f0bf188b4ed49874e6c9 (diff) | |
non-consuming variant of do_symlinkat()
similar to previous commit; replacement is filename_symlinkat()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/init.c | 5 | ||||
| -rw-r--r-- | fs/internal.h | 2 | ||||
| -rw-r--r-- | fs/namei.c | 23 |
3 files changed, 15 insertions, 15 deletions
diff --git a/fs/init.c b/fs/init.c index f46e54552931..a54ef750ffe3 100644 --- a/fs/init.c +++ b/fs/init.c @@ -152,8 +152,9 @@ int __init init_link(const char *oldname, const char *newname) int __init init_symlink(const char *oldname, const char *newname) { - return do_symlinkat(getname_kernel(oldname), AT_FDCWD, - getname_kernel(newname)); + CLASS(filename_kernel, old)(oldname); + CLASS(filename_kernel, new)(newname); + return filename_symlinkat(old, AT_FDCWD, new); } int __init init_unlink(const char *pathname) diff --git a/fs/internal.h b/fs/internal.h index c9b70c2716d1..4a63b89c02d7 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -61,7 +61,7 @@ int filename_renameat2(int olddfd, struct filename *oldname, int newdfd, struct filename *newname, unsigned int flags); int do_mkdirat(int dfd, struct filename *name, umode_t mode); int do_mknodat(int dfd, struct filename *name, umode_t mode, unsigned int dev); -int do_symlinkat(struct filename *from, int newdfd, struct filename *to); +int filename_symlinkat(struct filename *from, int newdfd, struct filename *to); int filename_linkat(int olddfd, struct filename *old, int newdfd, struct filename *new, int flags); int vfs_tmpfile(struct mnt_idmap *idmap, diff --git a/fs/namei.c b/fs/namei.c index e5d494610c2c..c88ad27f66c7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -5581,7 +5581,7 @@ int vfs_symlink(struct mnt_idmap *idmap, struct inode *dir, } EXPORT_SYMBOL(vfs_symlink); -int do_symlinkat(struct filename *from, int newdfd, struct filename *to) +int filename_symlinkat(struct filename *from, int newdfd, struct filename *to) { int error; struct dentry *dentry; @@ -5589,15 +5589,13 @@ int do_symlinkat(struct filename *from, int newdfd, struct filename *to) unsigned int lookup_flags = 0; struct delegated_inode delegated_inode = { }; - if (IS_ERR(from)) { - error = PTR_ERR(from); - goto out_putnames; - } + if (IS_ERR(from)) + return PTR_ERR(from); + retry: dentry = filename_create(newdfd, to, &path, lookup_flags); - error = PTR_ERR(dentry); if (IS_ERR(dentry)) - goto out_putnames; + return PTR_ERR(dentry); error = security_path_symlink(&path, dentry, from->name); if (!error) @@ -5613,21 +5611,22 @@ retry: lookup_flags |= LOOKUP_REVAL; goto retry; } -out_putnames: - putname(to); - putname(from); return error; } SYSCALL_DEFINE3(symlinkat, const char __user *, oldname, int, newdfd, const char __user *, newname) { - return do_symlinkat(getname(oldname), newdfd, getname(newname)); + CLASS(filename, old)(oldname); + CLASS(filename, new)(newname); + return filename_symlinkat(old, newdfd, new); } SYSCALL_DEFINE2(symlink, const char __user *, oldname, const char __user *, newname) { - return do_symlinkat(getname(oldname), AT_FDCWD, getname(newname)); + CLASS(filename, old)(oldname); + CLASS(filename, new)(newname); + return filename_symlinkat(old, AT_FDCWD, new); } /** |