diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/buffer_head.h | |
parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/buffer_head.h')
-rw-r--r-- | include/linux/buffer_head.h | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index bd7ac793be19..16ed0284d780 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
@@ -155,6 +155,7 @@ void create_empty_buffers(struct page *, unsigned long, | |||
155 | unsigned long b_state); | 155 | unsigned long b_state); |
156 | void end_buffer_read_sync(struct buffer_head *bh, int uptodate); | 156 | void end_buffer_read_sync(struct buffer_head *bh, int uptodate); |
157 | void end_buffer_write_sync(struct buffer_head *bh, int uptodate); | 157 | void end_buffer_write_sync(struct buffer_head *bh, int uptodate); |
158 | void end_buffer_async_write(struct buffer_head *bh, int uptodate); | ||
158 | 159 | ||
159 | /* Things to do with buffers at mapping->private_list */ | 160 | /* Things to do with buffers at mapping->private_list */ |
160 | void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode); | 161 | void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode); |
@@ -165,15 +166,8 @@ int sync_mapping_buffers(struct address_space *mapping); | |||
165 | void unmap_underlying_metadata(struct block_device *bdev, sector_t block); | 166 | void unmap_underlying_metadata(struct block_device *bdev, sector_t block); |
166 | 167 | ||
167 | void mark_buffer_async_write(struct buffer_head *bh); | 168 | void mark_buffer_async_write(struct buffer_head *bh); |
168 | void invalidate_bdev(struct block_device *); | ||
169 | int sync_blockdev(struct block_device *bdev); | ||
170 | void __wait_on_buffer(struct buffer_head *); | 169 | void __wait_on_buffer(struct buffer_head *); |
171 | wait_queue_head_t *bh_waitq_head(struct buffer_head *bh); | 170 | wait_queue_head_t *bh_waitq_head(struct buffer_head *bh); |
172 | int fsync_bdev(struct block_device *); | ||
173 | struct super_block *freeze_bdev(struct block_device *); | ||
174 | int thaw_bdev(struct block_device *, struct super_block *); | ||
175 | int fsync_super(struct super_block *); | ||
176 | int fsync_no_super(struct block_device *); | ||
177 | struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block, | 171 | struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block, |
178 | unsigned size); | 172 | unsigned size); |
179 | struct buffer_head *__getblk(struct block_device *bdev, sector_t block, | 173 | struct buffer_head *__getblk(struct block_device *bdev, sector_t block, |
@@ -204,6 +198,8 @@ extern int buffer_heads_over_limit; | |||
204 | void block_invalidatepage(struct page *page, unsigned long offset); | 198 | void block_invalidatepage(struct page *page, unsigned long offset); |
205 | int block_write_full_page(struct page *page, get_block_t *get_block, | 199 | int block_write_full_page(struct page *page, get_block_t *get_block, |
206 | struct writeback_control *wbc); | 200 | struct writeback_control *wbc); |
201 | int block_write_full_page_endio(struct page *page, get_block_t *get_block, | ||
202 | struct writeback_control *wbc, bh_end_io_t *handler); | ||
207 | int block_read_full_page(struct page*, get_block_t*); | 203 | int block_read_full_page(struct page*, get_block_t*); |
208 | int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc, | 204 | int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc, |
209 | unsigned long from); | 205 | unsigned long from); |
@@ -223,7 +219,7 @@ int cont_write_begin(struct file *, struct address_space *, loff_t, | |||
223 | get_block_t *, loff_t *); | 219 | get_block_t *, loff_t *); |
224 | int generic_cont_expand_simple(struct inode *inode, loff_t size); | 220 | int generic_cont_expand_simple(struct inode *inode, loff_t size); |
225 | int block_commit_write(struct page *page, unsigned from, unsigned to); | 221 | int block_commit_write(struct page *page, unsigned from, unsigned to); |
226 | int block_page_mkwrite(struct vm_area_struct *vma, struct page *page, | 222 | int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf, |
227 | get_block_t get_block); | 223 | get_block_t get_block); |
228 | void block_sync_page(struct page *); | 224 | void block_sync_page(struct page *); |
229 | sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); | 225 | sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *); |
@@ -339,22 +335,10 @@ extern int __set_page_dirty_buffers(struct page *page); | |||
339 | 335 | ||
340 | static inline void buffer_init(void) {} | 336 | static inline void buffer_init(void) {} |
341 | static inline int try_to_free_buffers(struct page *page) { return 1; } | 337 | static inline int try_to_free_buffers(struct page *page) { return 1; } |
342 | static inline int sync_blockdev(struct block_device *bdev) { return 0; } | ||
343 | static inline int inode_has_buffers(struct inode *inode) { return 0; } | 338 | static inline int inode_has_buffers(struct inode *inode) { return 0; } |
344 | static inline void invalidate_inode_buffers(struct inode *inode) {} | 339 | static inline void invalidate_inode_buffers(struct inode *inode) {} |
345 | static inline int remove_inode_buffers(struct inode *inode) { return 1; } | 340 | static inline int remove_inode_buffers(struct inode *inode) { return 1; } |
346 | static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; } | 341 | static inline int sync_mapping_buffers(struct address_space *mapping) { return 0; } |
347 | static inline void invalidate_bdev(struct block_device *bdev) {} | ||
348 | |||
349 | static inline struct super_block *freeze_bdev(struct block_device *sb) | ||
350 | { | ||
351 | return NULL; | ||
352 | } | ||
353 | |||
354 | static inline int thaw_bdev(struct block_device *bdev, struct super_block *sb) | ||
355 | { | ||
356 | return 0; | ||
357 | } | ||
358 | 342 | ||
359 | #endif /* CONFIG_BLOCK */ | 343 | #endif /* CONFIG_BLOCK */ |
360 | #endif /* _LINUX_BUFFER_HEAD_H */ | 344 | #endif /* _LINUX_BUFFER_HEAD_H */ |