diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-02 02:36:47 +0000 |
| commit | 8624512aa908741ba2795200133eae0d7f4557ea (patch) | |
| tree | d5d3036fccf2604f4c98dedc11e8adb929d6b52e /fs/binfmt_elf.c | |
| parent | 7b8f5d6f1d45d9f9de1d26e7d3c32aa5af11b488 (diff) | |
Merge with 2.3.48.
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 743375bc9..7ce625d6d 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -225,8 +225,8 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, goto out; if (!elf_check_arch(interp_elf_ex->e_machine)) goto out; - if (!interpreter_dentry->d_inode->i_op || - !interpreter_dentry->d_inode->i_op->default_file_ops->mmap) + if (!interpreter_dentry->d_inode->i_fop || + !interpreter_dentry->d_inode->i_fop->mmap) goto out; /* @@ -432,9 +432,7 @@ do_load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs) goto out; } #endif - if (!bprm->dentry->d_inode->i_op || - !bprm->dentry->d_inode->i_op->default_file_ops || - !bprm->dentry->d_inode->i_op->default_file_ops->mmap) + if (!bprm->dentry->d_inode->i_fop||!bprm->dentry->d_inode->i_fop->mmap) goto out; /* Now read in all of the header information */ @@ -838,7 +836,7 @@ do_load_elf_library(int fd) /* First of all, some simple consistency checks */ if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 || !elf_check_arch(elf_ex.e_machine) || - (!inode->i_op || !inode->i_op->default_file_ops->mmap)) + (!inode->i_fop || !inode->i_fop->mmap)) goto out_putf; /* Now read in all of the header information */ |