From patchwork Wed Aug 8 13:21:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1295771 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3D9B33FCFC for ; Wed, 8 Aug 2012 13:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758425Ab2HHNV6 (ORCPT ); Wed, 8 Aug 2012 09:21:58 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:39317 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758430Ab2HHNVz (ORCPT ); Wed, 8 Aug 2012 09:21:55 -0400 Received: by mail-gg0-f174.google.com with SMTP id k6so15227ggd.19 for ; Wed, 08 Aug 2012 06:21:54 -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=ryAFnIUIfnrT/J+ko23AXKD7P9wkcp6+QT2Kp7+VHt4=; b=bK+mv1aa2aiDiS0DCzmu8uAY+57nu2v+0lqKf47pzEoE66H7WZzPeZMb2tv/R/Plin 5RQ27aeP6iix5lDDtgHNbVXQmAKHXo4Oh7F/Pzs4AV7zCiDrkOe0j7VFX2WqWIGW+o7O ZkrR+jixfOq3MbgUn3VH13XG+BSAWD+XybNaYEu8ljOddOg+tHK5jrcIf0kb9/96ZrfV TCxjk8RxcVnwrX30fNdnOI/rD6kH1YzgOuNGn1gi7lxzTBG0Ob3WRH5bmXgjDfyp7kcP efNSb3PpVQSM3dB6vC4s+FzH+po6KpRu10PvEbspZzJqO29J/UsCyLzcJHGu5ttNwhpw f4wg== Received: by 10.236.76.198 with SMTP id b46mr269197yhe.117.1344432114688; Wed, 08 Aug 2012 06:21:54 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-069-134-145-027.nc.res.rr.com. [69.134.145.27]) by mx.google.com with ESMTPS id l1sm24418002yhm.19.2012.08.08.06.21.53 (version=SSLv3 cipher=OTHER); Wed, 08 Aug 2012 06:21:54 -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 v5 05/19] vfs: remove user_path_at_empty Date: Wed, 8 Aug 2012 09:21:28 -0400 Message-Id: <1344432102-22312-6-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com> References: <1344432102-22312-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQn1Peym/DmC7Ox1O9K6rQJ6dIp7XL5F+MJPyCYsty7noscyvHk2zaZ56UGv5/l0eSyHkZIm 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 e66161f..dc58de9 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -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) { diff --git a/include/linux/namei.h b/include/linux/namei.h index 482f87f..491fb48 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -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)