diff --git a/[refs] b/[refs] index 65d6a0f1dbfd..a980c646dfa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16b6287a5286e872abece4f42a6eb5899157a836 +refs/heads/master: c4a7808fc3d7a346d5d12e0d69d76d66d821488b diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 3bdb29615a9d..b9fdda8c0930 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -107,6 +107,8 @@ * any extra contention... */ +static int fastcall link_path_walk(const char *name, struct nameidata *nd); + /* In order to reduce some races, while at the same time doing additional * checking and hopefully speeding things up, we copy filenames to the * kernel data space before using them.. @@ -998,7 +1000,7 @@ static fastcall int __link_path_walk(const char * name, struct nameidata *nd) * Retry the whole path once, forcing real lookup requests * instead of relying on the dcache. */ -int fastcall link_path_walk(const char *name, struct nameidata *nd) +static int fastcall link_path_walk(const char *name, struct nameidata *nd) { struct nameidata save = *nd; int result; diff --git a/trunk/include/linux/namei.h b/trunk/include/linux/namei.h index 2e21af0989d9..18ea81265068 100644 --- a/trunk/include/linux/namei.h +++ b/trunk/include/linux/namei.h @@ -72,7 +72,6 @@ extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *)); extern int vfs_path_lookup(struct dentry *, struct vfsmount *, const char *, unsigned int, struct nameidata *); extern int FASTCALL(path_walk(const char *, struct nameidata *)); -extern int FASTCALL(link_path_walk(const char *, struct nameidata *)); extern void path_release(struct nameidata *); extern void path_release_on_umount(struct nameidata *);