diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-02-17 17:02:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-02-17 17:02:13 -0800 |
| commit | 2796576e0cff656d34368221121729846b4e1de5 (patch) | |
| tree | f5dc91b6f800bb80d201e5abea8238ddd89612f5 /include | |
| parent | 98d809e7d3f9f3c04a8b67d3de21a2d4f50af26b (diff) | |
| parent | 071c9b22a256c3a08aeb73dc64f7b8613a2fc02c (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/morton
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 561b075e9a4b..18cdb72c8d3c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1230,8 +1230,8 @@ static inline int fsync_inode_data_buffers(struct inode *inode) return fsync_buffers_list(&inode->i_dirty_data_buffers); } extern int inode_has_buffers(struct inode *); -extern void filemap_fdatasync(struct address_space *); -extern void filemap_fdatawait(struct address_space *); +extern int filemap_fdatasync(struct address_space *); +extern int filemap_fdatawait(struct address_space *); extern void sync_supers(kdev_t); extern int bmap(struct inode *, int); extern int notify_change(struct dentry *, struct iattr *); @@ -1440,8 +1440,9 @@ sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); int generic_commit_write(struct file *, struct page *, unsigned, unsigned); int block_truncate_page(struct address_space *, loff_t, get_block_t *); extern int generic_direct_IO(int, struct inode *, struct kiobuf *, unsigned long, int, get_block_t *); +extern int waitfor_one_page(struct page *); +extern int writeout_one_page(struct page *); -extern int waitfor_one_page(struct page*); extern int generic_file_mmap(struct file *, struct vm_area_struct *); extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); extern ssize_t generic_file_read(struct file *, char *, size_t, loff_t *); |