Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 18535
b: refs/heads/master
c: f166235
h: refs/heads/master
i:
  18533: 541e5a0
  18531: dbf7484
  18527: 5259456
v: v3
  • Loading branch information
Arjan van de Ven authored and Linus Torvalds committed Jan 15, 2006
1 parent 57aba3c commit 1d9449e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 652050aec936fdd70ed9cbce1cd1ef30a7c9d117
refs/heads/master: f16623569e2ec055b489462315f5296f153d119b
8 changes: 4 additions & 4 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1d9449e

Please sign in to comment.