diff options
author | Christoph Lameter <christoph@graphe.net> | 2005-06-23 03:10:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:33 -0400 |
commit | 45778ca819accab1a4a3378b3566cab0f189164f (patch) | |
tree | 9214491346c8d2d91eb1a11cb6c2e6a9387e4290 /mm/filemap.c | |
parent | 280dedb8d64ccfe1166ae03d3b254fc3b65de6a5 (diff) |
[PATCH] Remove f_error field from struct file
The following patch removes the f_error field and all checks of f_error.
Trond said:
f_error was introduced for NFS, and made sense when we were guaranteed
always to have a file pointer around when write errors occurred. Since
then, we have (for various reasons) had to introduce the nfs_open_context in
order to track the file read/write state, and it made sense to move our
f_error tracking there too.
Signed-off-by: Christoph Lameter <christoph@lameter.com>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 4a2fee2cb62b..a3598b542a31 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 | |||
1827 | if (unlikely(*pos < 0)) | 1827 | if (unlikely(*pos < 0)) |
1828 | return -EINVAL; | 1828 | return -EINVAL; |
1829 | 1829 | ||
1830 | if (unlikely(file->f_error)) { | ||
1831 | int err = file->f_error; | ||
1832 | file->f_error = 0; | ||
1833 | return err; | ||
1834 | } | ||
1835 | |||
1836 | if (!isblk) { | 1830 | if (!isblk) { |
1837 | /* FIXME: this is for backwards compatibility with 2.4 */ | 1831 | /* FIXME: this is for backwards compatibility with 2.4 */ |
1838 | if (file->f_flags & O_APPEND) | 1832 | if (file->f_flags & O_APPEND) |