From 8624512aa908741ba2795200133eae0d7f4557ea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 2 Mar 2000 02:36:47 +0000 Subject: Merge with 2.3.48. --- fs/exec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'fs/exec.c') diff --git a/fs/exec.c b/fs/exec.c index efbf9a8ef..886e9ab8c 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -88,7 +88,7 @@ int open_dentry(struct dentry * dentry, int mode) l = &inode->i_sb->s_files; error = -EINVAL; - if (!inode->i_op || !inode->i_op->default_file_ops) + if (!inode->i_fop) goto out; fd = get_unused_fd(); if (fd >= 0) { @@ -101,7 +101,7 @@ int open_dentry(struct dentry * dentry, int mode) f->f_dentry = dentry; f->f_pos = 0; f->f_reada = 0; - f->f_op = inode->i_op->default_file_ops; + f->f_op = inode->i_fop; if (f->f_op->open) { error = f->f_op->open(inode,f); if (error) @@ -352,7 +352,7 @@ int read_exec(struct dentry *dentry, unsigned long offset, struct inode * inode = dentry->d_inode; int result = -ENOEXEC; - if (!inode->i_op || !inode->i_op->default_file_ops) + if (!inode->i_fop) goto end_readexec; if (init_private_file(&file, dentry, 1)) goto end_readexec; @@ -900,7 +900,7 @@ int do_coredump(long signr, struct pt_regs * regs) if (!S_ISREG(inode->i_mode)) goto close_fail; - if (!inode->i_op || !inode->i_op->default_file_ops) + if (!inode->i_fop) goto close_fail; if (!file->f_op->write) goto close_fail; -- cgit v1.2.3