[RFC: 2.6 patch] fs/buffer.c: possible cleanups

[Adrian Bunk]

This patch contains the following possible cleanups:
- add a proper prototype for the following global function:
  - buffer_init()
- make the following needlessly global function static:
  - end_buffer_async_write()

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

---

This patch was already sent on:
- 23 Apr 2006

 fs/buffer.c                 |    3 +--
 include/linux/buffer_head.h |    2 +-
 init/main.c                 |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

--- linux-2.6.17-rc1-mm3-full/include/linux/buffer_head.h.old	2006-04-23 12:07:30.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/include/linux/buffer_head.h	2006-04-23 12:19:48.000000000 +0200
@@ -149,7 +149,6 @@
 			unsigned long b_state);
 void end_buffer_read_sync(struct buffer_head *bh, int uptodate);
 void end_buffer_write_sync(struct buffer_head *bh, int uptodate);
-void end_buffer_async_write(struct buffer_head *bh, int uptodate);
 
 /* Things to do with buffers at mapping->private_list */
 void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode);
@@ -214,6 +213,7 @@
 int nobh_writepage(struct page *page, get_block_t *get_block,
                         struct writeback_control *wbc);
 
+void buffer_init(void);
 
 /*
  * inline definitions
--- linux-2.6.17-rc1-mm3-full/fs/buffer.c.old	2006-04-23 12:06:43.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/fs/buffer.c	2006-04-23 12:07:19.000000000 +0200
@@ -566,7 +566,7 @@
  * Completion handler for block_write_full_page() - pages which are unlocked
  * during I/O, and which have PageWriteback cleared upon I/O completion.
  */
-void end_buffer_async_write(struct buffer_head *bh, int uptodate)
+static void end_buffer_async_write(struct buffer_head *bh, int uptodate)
 {
 	char b[BDEVNAME_SIZE];
 	unsigned long flags;
@@ -3168,7 +3168,6 @@
 EXPORT_SYMBOL(block_truncate_page);
 EXPORT_SYMBOL(block_write_full_page);
 EXPORT_SYMBOL(cont_prepare_write);
-EXPORT_SYMBOL(end_buffer_async_write);
 EXPORT_SYMBOL(end_buffer_read_sync);
 EXPORT_SYMBOL(end_buffer_write_sync);
 EXPORT_SYMBOL(file_fsync);
--- linux-2.6.17-rc1-mm3-full/init/main.c.old	2006-04-23 12:17:46.000000000 +0200
+++ linux-2.6.17-rc1-mm3-full/init/main.c	2006-04-23 12:18:09.000000000 +0200
@@ -47,6 +47,7 @@
 #include <linux/rmap.h>
 #include <linux/mempolicy.h>
 #include <linux/key.h>
+#include <linux/buffer_head.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -79,7 +80,6 @@
 extern void sbus_init(void);
 extern void sysctl_init(void);
 extern void signals_init(void);
-extern void buffer_init(void);
 extern void pidhash_init(void);
 extern void pidmap_init(void);
 extern void prio_tree_init(void);

-
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/