[PATCH] Make address_space_operations->invalidatepage return void
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. [akpm@osdl.org: JBD BUG fix] [akpm@osdl.org: rework for git-nfs] [akpm@osdl.org: don't go BUG in block_invalidate_page()] Signed-off-by: Neil Brown <neilb@suse.de> Acked-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
3978d7179d
commit
2ff28e22bd
18
fs/buffer.c
18
fs/buffer.c
@@ -1593,11 +1593,10 @@ EXPORT_SYMBOL(try_to_release_page);
|
||||
* point. Because the caller is about to free (and possibly reuse) those
|
||||
* blocks on-disk.
|
||||
*/
|
||||
int block_invalidatepage(struct page *page, unsigned long offset)
|
||||
void block_invalidatepage(struct page *page, unsigned long offset)
|
||||
{
|
||||
struct buffer_head *head, *bh, *next;
|
||||
unsigned int curr_off = 0;
|
||||
int ret = 1;
|
||||
|
||||
BUG_ON(!PageLocked(page));
|
||||
if (!page_has_buffers(page))
|
||||
@@ -1624,19 +1623,18 @@ int block_invalidatepage(struct page *page, unsigned long offset)
|
||||
* so real IO is not possible anymore.
|
||||
*/
|
||||
if (offset == 0)
|
||||
ret = try_to_release_page(page, 0);
|
||||
try_to_release_page(page, 0);
|
||||
out:
|
||||
return ret;
|
||||
return;
|
||||
}
|
||||
EXPORT_SYMBOL(block_invalidatepage);
|
||||
|
||||
int do_invalidatepage(struct page *page, unsigned long offset)
|
||||
void do_invalidatepage(struct page *page, unsigned long offset)
|
||||
{
|
||||
int (*invalidatepage)(struct page *, unsigned long);
|
||||
invalidatepage = page->mapping->a_ops->invalidatepage;
|
||||
if (invalidatepage == NULL)
|
||||
invalidatepage = block_invalidatepage;
|
||||
return (*invalidatepage)(page, offset);
|
||||
void (*invalidatepage)(struct page *, unsigned long);
|
||||
invalidatepage = page->mapping->a_ops->invalidatepage ? :
|
||||
block_invalidatepage;
|
||||
(*invalidatepage)(page, offset);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user