[PATCH 002 of 2] Make address_space_operations->sync_page return void.
From: NeilBrown
Date: Sun Feb 26 2006 - 20:42:08 EST
The only user ignores the return value, and the only
instanace (block_sync_page) always returns 0...
Signed-off-by: Neil Brown <neilb@xxxxxxx>
### Diffstat output
./fs/buffer.c | 3 +--
./fs/cifs/file.c | 6 ++++--
./include/linux/buffer_head.h | 2 +-
./include/linux/fs.h | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff ./fs/buffer.c~current~ ./fs/buffer.c
--- ./fs/buffer.c~current~ 2006-02-27 12:12:57.000000000 +1100
+++ ./fs/buffer.c 2006-02-27 12:13:51.000000000 +1100
@@ -3012,7 +3012,7 @@ out:
}
EXPORT_SYMBOL(try_to_free_buffers);
-int block_sync_page(struct page *page)
+void block_sync_page(struct page *page)
{
struct address_space *mapping;
@@ -3020,7 +3020,6 @@ int block_sync_page(struct page *page)
mapping = page_mapping(page);
if (mapping)
blk_run_backing_dev(mapping->backing_dev_info, page);
- return 0;
}
/*
diff ./fs/cifs/file.c~current~ ./fs/cifs/file.c
--- ./fs/cifs/file.c~current~ 2006-02-27 12:12:57.000000000 +1100
+++ ./fs/cifs/file.c 2006-02-27 12:13:51.000000000 +1100
@@ -1339,7 +1339,7 @@ int cifs_fsync(struct file *file, struct
return rc;
}
-/* static int cifs_sync_page(struct page *page)
+/* static void cifs_sync_page(struct page *page)
{
struct address_space *mapping;
struct inode *inode;
@@ -1353,16 +1353,18 @@ int cifs_fsync(struct file *file, struct
return 0;
inode = mapping->host;
if (!inode)
- return 0; */
+ return; */
/* fill in rpages then
result = cifs_pagein_inode(inode, index, rpages); */ /* BB finish */
/* cFYI(1, ("rpages is %d for sync page of Index %ld ", rpages, index));
+#if 0
if (rc < 0)
return rc;
return 0;
+#endif
} */
/*
diff ./include/linux/buffer_head.h~current~ ./include/linux/buffer_head.h
--- ./include/linux/buffer_head.h~current~ 2006-02-27 12:12:57.000000000 +1100
+++ ./include/linux/buffer_head.h 2006-02-27 12:13:51.000000000 +1100
@@ -200,7 +200,7 @@ int cont_prepare_write(struct page*, uns
int generic_cont_expand(struct inode *inode, loff_t size);
int generic_cont_expand_simple(struct inode *inode, loff_t size);
int block_commit_write(struct page *page, unsigned from, unsigned to);
-int block_sync_page(struct page *);
+void block_sync_page(struct page *);
sector_t generic_block_bmap(struct address_space *, sector_t, get_block_t *);
int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
int block_truncate_page(struct address_space *, loff_t, get_block_t *);
diff ./include/linux/fs.h~current~ ./include/linux/fs.h
--- ./include/linux/fs.h~current~ 2006-02-27 12:12:57.000000000 +1100
+++ ./include/linux/fs.h 2006-02-27 12:13:51.000000000 +1100
@@ -340,7 +340,7 @@ struct writeback_control;
struct address_space_operations {
int (*writepage)(struct page *page, struct writeback_control *wbc);
int (*readpage)(struct file *, struct page *);
- int (*sync_page)(struct page *);
+ void (*sync_page)(struct page *);
/* Write back some dirty pages from this mapping. */
int (*writepages)(struct address_space *, struct writeback_control *);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/