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 /fs/fcntl.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/fcntl.c')
| -rw-r--r-- | fs/fcntl.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index 919204088..036c9eb1f 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -4,18 +4,10 @@ * Copyright (C) 1991, 1992 Linus Torvalds */ -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/stat.h> -#include <linux/fcntl.h> -#include <linux/file.h> -#include <linux/string.h> #include <linux/mm.h> -#include <linux/smp.h> +#include <linux/file.h> #include <linux/smp_lock.h> -#include <asm/bitops.h> #include <asm/uaccess.h> extern int sock_fcntl (struct file *, unsigned int cmd, unsigned long arg); @@ -97,7 +89,7 @@ static int setfl(int fd, struct file * filp, unsigned long arg) /* Did FASYNC state change? */ if ((arg ^ filp->f_flags) & FASYNC) { - if (filp->f_op->fasync) + if (filp->f_op && filp->f_op->fasync) filp->f_op->fasync(fd, filp, (arg & FASYNC) != 0); } |