From: NeilBrown The return value of this function is never used, so let's be honest and declare it as void. Some places where invalidatepage returned 0, I have inserted comments suggesting a BUG_ON. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/reiser4/as_ops.c | 13 ++++++------- fs/reiser4/vfs_ops.h | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff -puN fs/reiser4/as_ops.c~make-address_space_operations-invalidatepage-return-void-reiser4 fs/reiser4/as_ops.c --- devel/fs/reiser4/as_ops.c~make-address_space_operations-invalidatepage-return-void-reiser4 2006-03-12 17:05:39.000000000 -0800 +++ devel-akpm/fs/reiser4/as_ops.c 2006-03-12 17:05:39.000000000 -0800 @@ -170,7 +170,7 @@ reiser4_readpages(struct file *file, str * @offset: starting offset for partial invalidation * */ -int reiser4_invalidatepage(struct page *page, unsigned long offset) +void reiser4_invalidatepage(struct page *page, unsigned long offset) { int ret = 0; reiser4_context *ctx; @@ -208,11 +208,11 @@ int reiser4_invalidatepage(struct page * * them. Check for this, and do nothing. */ if (get_super_fake(inode->i_sb) == inode) - return 0; + return; if (get_cc_fake(inode->i_sb) == inode) - return 0; + return; if (get_bitmap_fake(inode->i_sb) == inode) - return 0; + return; assert("vs-1426", PagePrivate(page)); assert("vs-1427", page->mapping == jnode_get_mapping(jnode_by_page(page))); @@ -222,7 +222,7 @@ int reiser4_invalidatepage(struct page * ctx = init_context(inode->i_sb); if (IS_ERR(ctx)) - return PTR_ERR(ctx); + return; node = jprivate(page); spin_lock_jnode(node); @@ -236,7 +236,7 @@ int reiser4_invalidatepage(struct page * unhash_unformatted_jnode(node); jput(node); reiser4_exit_context(ctx); - return 0; + return; } spin_unlock_jnode(node); @@ -265,7 +265,6 @@ int reiser4_invalidatepage(struct page * } reiser4_exit_context(ctx); - return ret; } /* help function called from reiser4_releasepage(). It returns true if jnode diff -puN fs/reiser4/vfs_ops.h~make-address_space_operations-invalidatepage-return-void-reiser4 fs/reiser4/vfs_ops.h --- devel/fs/reiser4/vfs_ops.h~make-address_space_operations-invalidatepage-return-void-reiser4 2006-03-12 17:05:39.000000000 -0800 +++ devel-akpm/fs/reiser4/vfs_ops.h 2006-03-12 17:05:39.000000000 -0800 @@ -24,7 +24,7 @@ int reiser4_writepage(struct page *, str int reiser4_set_page_dirty(struct page *); int reiser4_readpages(struct file *, struct address_space *, struct list_head *pages, unsigned nr_pages); -int reiser4_invalidatepage(struct page *, unsigned long offset); +void reiser4_invalidatepage(struct page *, unsigned long offset); int reiser4_releasepage(struct page *, gfp_t); extern int reiser4_update_sd(struct inode *); _