From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v3 05/17] vfs: remove user_path_at_empty Date: Fri, 29 Jun 2012 14:57:48 -0400 Message-ID: <1340996280-27123-6-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> Cc: linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, michael.brantley-Iq/kdjr4a97QT0dZR+AlfA@public.gmane.org, hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org, pstaubach-83r9SdEf25FBDgjK7y7TUQ@public.gmane.org To: viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org Return-path: In-Reply-To: <1340996280-27123-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: linux-nfs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-fsdevel.vger.kernel.org ...there are no more callers. Signed-off-by: Jeff Layton --- fs/namei.c | 12 +++--------- include/linux/namei.h | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 44c7ccd..7945b19 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1926,10 +1926,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)) { @@ -1941,12 +1941,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) { diff --git a/include/linux/namei.h b/include/linux/namei.h index cd95fcb..1ea93d5 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -68,7 +68,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) -- 1.7.7.6 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html