From 1d9449ee9f35ff74a164d0cc6ec48cca24bc103e Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Sat, 14 Jan 2006 13:21:31 -0800
Subject: [PATCH] --- yaml --- r: 18535 b: refs/heads/master c:
 f16623569e2ec055b489462315f5296f153d119b h: refs/heads/master i:   18533:
 541e5a092be8c2e1a9b6d6bbabfebd16841852e4   18531:
 dbf748404982dfb85f16f355ef6bb7adedc38658   18527:
 5259456331a97fbde3fead42ab15d858df702bc9 v: v3

---
 [refs]           | 2 +-
 trunk/fs/namei.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0d1daa1a1873..035985bba029 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652050aec936fdd70ed9cbce1cd1ef30a7c9d117
+refs/heads/master: f16623569e2ec055b489462315f5296f153d119b
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 7bde381fa490..33fb5bd34a81 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -486,7 +486,7 @@ static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, s
 static int __emul_lookup_dentry(const char *, struct nameidata *);
 
 /* SMP-safe */
-static inline int
+static __always_inline int
 walk_init_root(const char *name, struct nameidata *nd)
 {
 	read_lock(&current->fs->lock);
@@ -504,7 +504,7 @@ walk_init_root(const char *name, struct nameidata *nd)
 	return 1;
 }
 
-static inline int __vfs_follow_link(struct nameidata *nd, const char *link)
+static __always_inline int __vfs_follow_link(struct nameidata *nd, const char *link)
 {
 	int res = 0;
 	char *name;
@@ -544,7 +544,7 @@ struct path {
 	struct dentry *dentry;
 };
 
-static inline int __do_follow_link(struct path *path, struct nameidata *nd)
+static __always_inline int __do_follow_link(struct path *path, struct nameidata *nd)
 {
 	int error;
 	void *cookie;
@@ -690,7 +690,7 @@ int follow_down(struct vfsmount **mnt, struct dentry **dentry)
 	return 0;
 }
 
-static inline void follow_dotdot(struct nameidata *nd)
+static __always_inline void follow_dotdot(struct nameidata *nd)
 {
 	while(1) {
 		struct vfsmount *parent;