diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
| commit | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (patch) | |
| tree | 02f99e208949486c8899a310846dee444bac8093 /mm/filemap.c | |
| parent | 0c0ff09329dafb165c0d9ac08965ddc0615020b1 (diff) | |
| parent | 16822e62053e73fa7def9decc38a7e287d27d980 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 4a2fee2cb62..a3598b542a3 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1827,12 +1827,6 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i if (unlikely(*pos < 0)) return -EINVAL; - if (unlikely(file->f_error)) { - int err = file->f_error; - file->f_error = 0; - return err; - } - if (!isblk) { /* FIXME: this is for backwards compatibility with 2.4 */ if (file->f_flags & O_APPEND) |