From patchwork Fri Jun 29 18:57:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1133341 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 541E6DFF34 for ; Fri, 29 Jun 2012 19:02:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755480Ab2F2TCT (ORCPT ); Fri, 29 Jun 2012 15:02:19 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=l+xPWV8YzkVQ7sU99rPlckegiYdrslNCmf3k5AU5jXw=; b=g9LYaH1cm0mp02uWdU6qpTOoTTIh0uraEpguD42R4r5ghY425GbCUTFf+D7N72/rNc oX0e+Xa2CsJG1vewVVAyOmkRf0RDN057vbiMrOoKvyU47nTXe0wD8cuI7lUgEcwUo0WZ dQmAn0hy4hqDtCR0vjVyjJScA27ps6ZJ6zfXac2vxP9FdMMSC1QZkcE04oapcul7wjBn yGjr9bb+rdbZRPX0mvm3gU9ZbZulZ7pYsZTMer+38F1/BKzWaywtIkZX8hewJMY2UBk+ lA2GGL7b/8iqQX02/d0SvJIpuRYWXPIw8QljLlviuPHawbxLibpBxELNjZ9NGLJ0gvZf p1wA== Received: by 10.236.78.36 with SMTP id f24mr4701299yhe.20.1340996294976; Fri, 29 Jun 2012 11:58:14 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id l13sm3936309ann.2.2012.06.29.11.58.13 (version=SSLv3 cipher=OTHER); Fri, 29 Jun 2012 11:58:14 -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> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkfFx/57LC5YVUDCjieedVuLpZWpXyInLDbLqL85NN1CGDCdH4fwY4h9Y32geBpc8+BBwnU Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@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)