diff options
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 20 | 
1 files changed, 5 insertions, 15 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 2ce51fac7d3..43e649a7252 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -203,12 +203,10 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,  int block_read_full_page(struct page*, get_block_t*);  int block_is_partially_uptodate(struct page *page, read_descriptor_t *desc,  				unsigned long from); -int block_write_begin_newtrunc(struct file *, struct address_space *, -				loff_t, unsigned, unsigned, -				struct page **, void **, get_block_t*); -int block_write_begin(struct file *, struct address_space *, -				loff_t, unsigned, unsigned, -				struct page **, void **, get_block_t*); +int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, +		unsigned flags, struct page **pagep, get_block_t *get_block); +int __block_write_begin(struct page *page, loff_t pos, unsigned len, +		get_block_t *get_block);  int block_write_end(struct file *, struct address_space *,  				loff_t, unsigned, unsigned,  				struct page *, void *); @@ -217,9 +215,6 @@ int generic_write_end(struct file *, struct address_space *,  				struct page *, void *);  void page_zero_new_buffers(struct page *page, unsigned from, unsigned to);  int block_prepare_write(struct page*, unsigned, unsigned, get_block_t*); -int cont_write_begin_newtrunc(struct file *, struct address_space *, loff_t, -			unsigned, unsigned, struct page **, void **, -			get_block_t *, loff_t *);  int cont_write_begin(struct file *, struct address_space *, loff_t,  			unsigned, unsigned, struct page **, void **,  			get_block_t *, loff_t *); @@ -230,12 +225,7 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,  void block_sync_page(struct page *);  sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);  int block_truncate_page(struct address_space *, loff_t, get_block_t *); -int file_fsync(struct file *, int); -int nobh_write_begin_newtrunc(struct file *, struct address_space *, -				loff_t, unsigned, unsigned, -				struct page **, void **, get_block_t*); -int nobh_write_begin(struct file *, struct address_space *, -				loff_t, unsigned, unsigned, +int nobh_write_begin(struct address_space *, loff_t, unsigned, unsigned,  				struct page **, void **, get_block_t*);  int nobh_write_end(struct file *, struct address_space *,  				loff_t, unsigned, unsigned,  |