From ba2e061f082083353b810009c3905619255c9b95 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 31 Mar 2006 02:32:11 -0800 Subject: [PATCH] --- yaml --- r: 24943 b: refs/heads/master c: a244e1698ae3609cdfe24088e1293593cb7a5278 h: refs/heads/master i: 24941: c29eb077f35a2887930eda45b3b8c16b4b8f4076 24939: 78dcb504323ae56819473700baad744ebe8b650f 24935: 5b3aa403b88f1f9d0b8ca5839623dfa86d2911b9 24927: cb18bfd508cb5e2ac49edfdb30fee83db1b071c2 v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 7 ------- trunk/fs/namei.c | 3 +-- trunk/include/linux/namei.h | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e05926cd6eba..df64304bfa8e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cb3463f04e771869f481e2dd44f66419e850586 +refs/heads/master: a244e1698ae3609cdfe24088e1293593cb7a5278 diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index a92b10bb0b03..59d0c74c79c9 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -127,13 +127,6 @@ Who: Christoph Hellwig --------------------------- -What: EXPORT_SYMBOL(lookup_hash) -When: January 2006 -Why: Too low-level interface. Use lookup_one_len or lookup_create instead. -Who: Christoph Hellwig - ---------------------------- - What: CONFIG_FORCED_INLINING When: June 2006 Why: Config option is there to see if gcc is good enough. (in january diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index 22f6e8d16aa8..96723ae83c89 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1254,7 +1254,7 @@ static struct dentry * __lookup_hash(struct qstr *name, struct dentry * base, st return dentry; } -struct dentry * lookup_hash(struct nameidata *nd) +static struct dentry *lookup_hash(struct nameidata *nd) { return __lookup_hash(&nd->last, nd->dentry, nd); } @@ -2697,7 +2697,6 @@ EXPORT_SYMBOL(follow_up); EXPORT_SYMBOL(get_write_access); /* binfmt_aout */ EXPORT_SYMBOL(getname); EXPORT_SYMBOL(lock_rename); -EXPORT_SYMBOL(lookup_hash); EXPORT_SYMBOL(lookup_one_len); EXPORT_SYMBOL(page_follow_link_light); EXPORT_SYMBOL(page_put_link); diff --git a/trunk/include/linux/namei.h b/trunk/include/linux/namei.h index e6698013e4d0..58cb3d3d44b4 100644 --- a/trunk/include/linux/namei.h +++ b/trunk/include/linux/namei.h @@ -75,7 +75,6 @@ extern struct file *nameidata_to_filp(struct nameidata *nd, int flags); extern void release_open_intent(struct nameidata *); extern struct dentry * lookup_one_len(const char *, struct dentry *, int); -extern __deprecated_for_modules struct dentry * lookup_hash(struct nameidata *); extern int follow_down(struct vfsmount **, struct dentry **); extern int follow_up(struct vfsmount **, struct dentry **);