diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/asm-mips/namei.h | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/asm-mips/namei.h')
-rw-r--r-- | include/asm-mips/namei.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/asm-mips/namei.h b/include/asm-mips/namei.h index eb895b003..d61b3cd82 100644 --- a/include/asm-mips/namei.h +++ b/include/asm-mips/namei.h @@ -3,7 +3,7 @@ * * Included from linux/fs/namei.c * - * $Id: namei.h,v 1.6 1997/09/18 07:59:31 root Exp $ + * $Id: namei.h,v 1.5 1997/12/01 18:00:40 ralf Exp $ */ #ifndef __ASM_MIPS_NAMEI_H #define __ASM_MIPS_NAMEI_H @@ -14,7 +14,7 @@ #define IRIX32_EMUL "usr/gnemul/irix/" static inline struct dentry * -__mips_lookup_dentry(const char *name, int follow_link) +__mips_lookup_dentry(const char *name, int lookup_flags) { struct dentry *base; @@ -22,11 +22,12 @@ __mips_lookup_dentry(const char *name, int follow_link) return ERR_PTR(-ENOENT); base = lookup_dentry (IRIX32_EMUL, - dget (current->fs->root), 1); + dget (current->fs->root), + (LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_SLASHOK)); if (IS_ERR (base)) return base; - base = lookup_dentry (name, base, follow_link); + base = lookup_dentry (name, base, lookup_flags); if (IS_ERR (base)) return base; @@ -40,13 +41,13 @@ __mips_lookup_dentry(const char *name, int follow_link) #ifdef CONFIG_BINFMT_IRIX -#define __prefix_lookup_dentry(name, follow_link) \ - dentry = __mips_lookup_dentry (name, follow_link); \ +#define __prefix_lookup_dentry(name, lookup_flags) \ + dentry = __mips_lookup_dentry (name, lookup_flags); \ if (!IS_ERR (dentry)) return dentry; #else /* !defined(CONFIG_BINFMT_IRIX) */ -#define __prefix_lookup_dentry(name, follow_link) \ +#define __prefix_lookup_dentry(name, lookup_flags) \ do {} while (0) #endif /* !defined(CONFIG_BINFMT_IRIX) */ |