diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:34:22 -0400 |
| commit | 6679ce6e5f519096612b480d255d9ca97be0c2be (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /include/linux/buffer_head.h | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 82aa36c53ea7..50cfe8ceb478 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
| @@ -205,6 +205,8 @@ void block_invalidatepage(struct page *page, unsigned long offset); | |||
| 205 | int block_write_full_page(struct page *page, get_block_t *get_block, | 205 | int block_write_full_page(struct page *page, get_block_t *get_block, |
| 206 | struct writeback_control *wbc); | 206 | struct writeback_control *wbc); |
| 207 | int block_read_full_page(struct page*, get_block_t*); | 207 | int block_read_full_page(struct page*, get_block_t*); |
| 208 | int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc, | ||
| 209 | unsigned long from); | ||
| 208 | int block_write_begin(struct file *, struct address_space *, | 210 | int block_write_begin(struct file *, struct address_space *, |
| 209 | loff_t, unsigned, unsigned, | 211 | loff_t, unsigned, unsigned, |
| 210 | struct page **, void **, get_block_t*); | 212 | struct page **, void **, get_block_t*); |
