diff options
Diffstat (limited to 'fs/minix/inode.c')
-rw-r--r-- | fs/minix/inode.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 43668d7d668f..f4f3343b1800 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -346,24 +346,39 @@ static int minix_writepage(struct page *page, struct writeback_control *wbc) | |||
346 | { | 346 | { |
347 | return block_write_full_page(page, minix_get_block, wbc); | 347 | return block_write_full_page(page, minix_get_block, wbc); |
348 | } | 348 | } |
349 | |||
349 | static int minix_readpage(struct file *file, struct page *page) | 350 | static int minix_readpage(struct file *file, struct page *page) |
350 | { | 351 | { |
351 | return block_read_full_page(page,minix_get_block); | 352 | return block_read_full_page(page,minix_get_block); |
352 | } | 353 | } |
353 | static int minix_prepare_write(struct file *file, struct page *page, unsigned from, unsigned to) | 354 | |
355 | int __minix_write_begin(struct file *file, struct address_space *mapping, | ||
356 | loff_t pos, unsigned len, unsigned flags, | ||
357 | struct page **pagep, void **fsdata) | ||
354 | { | 358 | { |
355 | return block_prepare_write(page,from,to,minix_get_block); | 359 | return block_write_begin(file, mapping, pos, len, flags, pagep, fsdata, |
360 | minix_get_block); | ||
356 | } | 361 | } |
362 | |||
363 | static int minix_write_begin(struct file *file, struct address_space *mapping, | ||
364 | loff_t pos, unsigned len, unsigned flags, | ||
365 | struct page **pagep, void **fsdata) | ||
366 | { | ||
367 | *pagep = NULL; | ||
368 | return __minix_write_begin(file, mapping, pos, len, flags, pagep, fsdata); | ||
369 | } | ||
370 | |||
357 | static sector_t minix_bmap(struct address_space *mapping, sector_t block) | 371 | static sector_t minix_bmap(struct address_space *mapping, sector_t block) |
358 | { | 372 | { |
359 | return generic_block_bmap(mapping,block,minix_get_block); | 373 | return generic_block_bmap(mapping,block,minix_get_block); |
360 | } | 374 | } |
375 | |||
361 | static const struct address_space_operations minix_aops = { | 376 | static const struct address_space_operations minix_aops = { |
362 | .readpage = minix_readpage, | 377 | .readpage = minix_readpage, |
363 | .writepage = minix_writepage, | 378 | .writepage = minix_writepage, |
364 | .sync_page = block_sync_page, | 379 | .sync_page = block_sync_page, |
365 | .prepare_write = minix_prepare_write, | 380 | .write_begin = minix_write_begin, |
366 | .commit_write = generic_commit_write, | 381 | .write_end = generic_write_end, |
367 | .bmap = minix_bmap | 382 | .bmap = minix_bmap |
368 | }; | 383 | }; |
369 | 384 | ||