diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /mm/filemap.c | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b1e2b8547..74eb0ef83 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -195,6 +195,7 @@ repeat: * to it causing all sorts of fun problems ... */ remove_inode_page(page); + ClearPageDirty(page); UnlockPage(page); page_cache_release(page); @@ -500,7 +501,7 @@ void add_to_page_cache_locked(struct page * page, struct address_space *mapping, /* * This adds a page to the page cache, starting out as locked, - * owned by us, referenced, but not uptodate and with no errors. + * owned by us, but unreferenced, not uptodate and with no errors. */ static inline void __add_to_page_cache(struct page * page, struct address_space *mapping, unsigned long offset, @@ -512,8 +513,8 @@ static inline void __add_to_page_cache(struct page * page, if (PageLocked(page)) BUG(); - flags = page->flags & ~((1 << PG_uptodate) | (1 << PG_error) | (1 << PG_dirty)); - page->flags = flags | (1 << PG_locked) | (1 << PG_referenced); + flags = page->flags & ~((1 << PG_uptodate) | (1 << PG_error) | (1 << PG_dirty) | (1 << PG_referenced)); + page->flags = flags | (1 << PG_locked); page_cache_get(page); page->index = offset; add_page_to_inode_queue(mapping, page); @@ -1744,7 +1745,7 @@ static int msync_interval(struct vm_area_struct * vma, if (!error && (flags & MS_SYNC)) { struct file * file = vma->vm_file; if (file && file->f_op && file->f_op->fsync) - error = file->f_op->fsync(file, file->f_dentry); + error = file->f_op->fsync(file, file->f_dentry, 1); } return error; } |