patch-2.3.48 linux/fs/binfmt_elf.c

• Lines: 31
• Date: Sat Feb 26 20:33:04 2000
• Orig file: v2.3.47/linux/fs/binfmt_elf.c
• Orig date: Wed Feb 16 17:03:52 2000

diff -u --recursive --new-file v2.3.47/linux/fs/binfmt_elf.c linux/fs/binfmt_elf.c
@@ -225,8 +225,8 @@
 		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;
 
 	/*
@@ -424,9 +424,7 @@
 		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 */
@@ -830,7 +828,7 @@
 	/* 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 */