diff options
Diffstat (limited to 'fs/reiserfs/inode.c')
-rw-r--r-- | fs/reiserfs/inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index d60f6238c66a..9857e50f85e7 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
@@ -466,7 +466,6 @@ static int reiserfs_get_block_create_0(struct inode *inode, sector_t block, | |||
466 | direct_IO request. */ | 466 | direct_IO request. */ |
467 | static int reiserfs_get_blocks_direct_io(struct inode *inode, | 467 | static int reiserfs_get_blocks_direct_io(struct inode *inode, |
468 | sector_t iblock, | 468 | sector_t iblock, |
469 | unsigned long max_blocks, | ||
470 | struct buffer_head *bh_result, | 469 | struct buffer_head *bh_result, |
471 | int create) | 470 | int create) |
472 | { | 471 | { |
@@ -2793,7 +2792,7 @@ static int invalidatepage_can_drop(struct inode *inode, struct buffer_head *bh) | |||
2793 | } | 2792 | } |
2794 | 2793 | ||
2795 | /* clm -- taken from fs/buffer.c:block_invalidate_page */ | 2794 | /* clm -- taken from fs/buffer.c:block_invalidate_page */ |
2796 | static int reiserfs_invalidatepage(struct page *page, unsigned long offset) | 2795 | static void reiserfs_invalidatepage(struct page *page, unsigned long offset) |
2797 | { | 2796 | { |
2798 | struct buffer_head *head, *bh, *next; | 2797 | struct buffer_head *head, *bh, *next; |
2799 | struct inode *inode = page->mapping->host; | 2798 | struct inode *inode = page->mapping->host; |
@@ -2832,10 +2831,12 @@ static int reiserfs_invalidatepage(struct page *page, unsigned long offset) | |||
2832 | * The get_block cached value has been unconditionally invalidated, | 2831 | * The get_block cached value has been unconditionally invalidated, |
2833 | * so real IO is not possible anymore. | 2832 | * so real IO is not possible anymore. |
2834 | */ | 2833 | */ |
2835 | if (!offset && ret) | 2834 | if (!offset && ret) { |
2836 | ret = try_to_release_page(page, 0); | 2835 | ret = try_to_release_page(page, 0); |
2836 | /* maybe should BUG_ON(!ret); - neilb */ | ||
2837 | } | ||
2837 | out: | 2838 | out: |
2838 | return ret; | 2839 | return; |
2839 | } | 2840 | } |
2840 | 2841 | ||
2841 | static int reiserfs_set_page_dirty(struct page *page) | 2842 | static int reiserfs_set_page_dirty(struct page *page) |