Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-gh0-f174.google.com ([209.85.160.174]:47464 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932657Ab2F2S6P (ORCPT ); Fri, 29 Jun 2012 14:58:15 -0400 Received: by ghrr11 with SMTP id r11so3053427ghr.19 for ; Fri, 29 Jun 2012 11:58:15 -0700 (PDT) From: Jeff Layton To: viro@ZenIV.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com 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> In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: ...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