@@ -2106,10 +2106,10 @@ int kern_path_at(int dfd, const char *name, unsigned flags, struct path *path)
return err;
}
-int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
- struct path *path, int *empty)
+int user_path_at(int dfd, const char __user *name, unsigned flags,
+ struct path *path)
{
- char *tmp = getname_flags(name, flags, empty);
+ char *tmp = getname_flags(name, flags, NULL);
int err;
if (IS_ERR(tmp)) {
@@ -2121,12 +2121,6 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
return err;
}
-int user_path_at(int dfd, const char __user *name, unsigned flags,
- struct path *path)
-{
- return user_path_at_empty(dfd, name, flags, path, NULL);
-}
-
static int user_path_parent(int dfd, const char __user *path,
struct nameidata *nd, char **name)
{
@@ -57,7 +57,6 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
extern int kern_path_at(int, const char *, unsigned, struct path *);
extern int user_path_at(int, const char __user *, unsigned, struct path *);
-extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);
#define user_path(name, path) user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW, path)
#define user_lpath(name, path) user_path_at(AT_FDCWD, name, 0, path)
...there are no more callers. Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/namei.c | 12 +++--------- include/linux/namei.h | 1 - 2 files changed, 3 insertions(+), 10 deletions(-)