diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2019-07-14 23:42:44 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-08-31 04:30:13 +0300 |
| commit | ce6595a28a15c874aee374757dcd08f537d7b24d (patch) | |
| tree | 1634deb62c3a778ceb3f0ea0517bfbe0e3003590 /fs | |
| parent | 6b61aed06a3b0eb8e8d49142ddd1e101a064444d (diff) | |
| download | linux-ce6595a28a15c874aee374757dcd08f537d7b24d.tar.xz | |
kill the last users of user_{path,lpath,path_dir}()
old wrappers with few callers remaining; put them out of their misery...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/coda/pioctl.c | 7 | ||||
| -rw-r--r-- | fs/namespace.c | 8 | ||||
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index 644d48c12ce8..3aec27e5eb82 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -63,11 +63,8 @@ static long coda_pioctl(struct file *filp, unsigned int cmd, * Look up the pathname. Note that the pathname is in * user memory, and namei takes care of this */ - if (data.follow) - error = user_path(data.path, &path); - else - error = user_lpath(data.path, &path); - + error = user_path_at(AT_FDCWD, data.path, + data.follow ? LOOKUP_FOLLOW : 0, &path); if (error) return error; diff --git a/fs/namespace.c b/fs/namespace.c index 697f8820dff5..b73478244356 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -3044,7 +3044,7 @@ long do_mount(const char *dev_name, const char __user *dir_name, return -EINVAL; /* ... and get the mountpoint */ - retval = user_path(dir_name, &path); + retval = user_path_at(AT_FDCWD, dir_name, LOOKUP_FOLLOW, &path); if (retval) return retval; @@ -3591,11 +3591,13 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, if (!may_mount()) return -EPERM; - error = user_path_dir(new_root, &new); + error = user_path_at(AT_FDCWD, new_root, + LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &new); if (error) goto out0; - error = user_path_dir(put_old, &old); + error = user_path_at(AT_FDCWD, put_old, + LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &old); if (error) goto out1; diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 6f7848cd5527..affa557c2337 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -67,7 +67,7 @@ xfs_find_handle( return -EBADF; inode = file_inode(f.file); } else { - error = user_lpath((const char __user *)hreq->path, &path); + error = user_path_at(AT_FDCWD, hreq->path, 0, &path); if (error) return error; inode = d_inode(path.dentry); |