diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-27 23:54:12 +0000 |
| commit | d3e71cb08747743fce908122bab08b479eb403a5 (patch) | |
| tree | cbec6948fdbdee9af81cf3ecfb504070d2745d7b /fs/binfmt_misc.c | |
| parent | fe7ff1706e323d0e5ed83972960a1ecc1ee538b3 (diff) | |
Merge with Linux 2.3.99-pre3.
Diffstat (limited to 'fs/binfmt_misc.c')
| -rw-r--r-- | fs/binfmt_misc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 9d98d7d70..a03c4723f 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -27,6 +27,7 @@ #include <linux/proc_fs.h> #include <linux/string.h> #include <linux/ctype.h> +#include <linux/file.h> #include <linux/spinlock.h> #include <asm/uaccess.h> @@ -180,7 +181,7 @@ static struct binfmt_entry *check_file(struct linux_binprm *bprm) static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) { struct binfmt_entry *fmt; - struct dentry * dentry; + struct file * file; char iname[128]; char *iname_addr = iname; int retval; @@ -200,8 +201,8 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) if (!fmt) goto _ret; - dput(bprm->dentry); - bprm->dentry = NULL; + fput(bprm->file); + bprm->file = NULL; /* Build args for interpreter */ remove_arg_zero(bprm); @@ -213,11 +214,11 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs) bprm->argc++; bprm->filename = iname; /* for binfmt_script */ - dentry = open_namei(iname); - retval = PTR_ERR(dentry); - if (IS_ERR(dentry)) + file = open_exec(iname); + retval = PTR_ERR(file); + if (IS_ERR(file)) goto _ret; - bprm->dentry = dentry; + bprm->file = file; retval = prepare_binprm(bprm); if (retval >= 0) |