Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965734AbbEMW1D (ORCPT ); Wed, 13 May 2015 18:27:03 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:44954 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965624AbbEMW0q (ORCPT ); Wed, 13 May 2015 18:26:46 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 21/21] turn user_{path_at,path,lpath,path_dir}() into static inlines Date: Wed, 13 May 2015 23:26:15 +0100 Message-Id: <1431555975-25997-21-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150513222533.GA24192@ZenIV.linux.org.uk> References: <20150513222533.GA24192@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2848 Lines: 90 From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 8 +------- include/linux/namei.h | 34 ++++++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index dead60d..8ca1fbd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2297,13 +2297,7 @@ int user_path_at_empty(int dfd, const char __user *name, unsigned flags, return filename_lookup(dfd, getname_flags(name, flags, empty), flags, path, NULL); } - -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); -} -EXPORT_SYMBOL(user_path_at); +EXPORT_SYMBOL(user_path_at_empty); /* * NB: most callers don't do anything directly with the reference to the diff --git a/include/linux/namei.h b/include/linux/namei.h index 1208e48..d8c6334 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -1,12 +1,10 @@ #ifndef _LINUX_NAMEI_H #define _LINUX_NAMEI_H -#include -#include -#include +#include #include - -struct vfsmount; +#include +#include enum { MAX_NESTED_LINKS = 8 }; @@ -46,13 +44,29 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND}; #define LOOKUP_ROOT 0x2000 #define LOOKUP_EMPTY 0x4000 -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) -#define user_path_dir(name, path) \ - user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, path) +static inline 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 inline int user_path(const char __user *name, struct path *path) +{ + return user_path_at_empty(AT_FDCWD, name, LOOKUP_FOLLOW, path, NULL); +} + +static inline int user_lpath(const char __user *name, struct path *path) +{ + return user_path_at_empty(AT_FDCWD, name, 0, path, NULL); +} + +static inline int user_path_dir(const char __user *name, struct path *path) +{ + return user_path_at_empty(AT_FDCWD, name, + LOOKUP_FOLLOW | LOOKUP_DIRECTORY, path, NULL); +} extern int kern_path(const char *, unsigned, struct path *); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/