From 146ef050d754fcfd3b922bf14d4708e9fe60c4c0 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 27 Jun 2006 02:53:54 -0700
Subject: [PATCH] --- yaml --- r: 30748 b: refs/heads/master c:
 b6cd0b772dcc5dc9b4c03d53946474dee399fa72 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ce5db403e470..19406fa14e97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7807a32bbb027ab9955b96734fdc7f1e6497a9f
+refs/heads/master: b6cd0b772dcc5dc9b4c03d53946474dee399fa72
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 373bb6292bdc..f23bb647db47 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -564,7 +564,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
  * 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;
@@ -3166,7 +3166,6 @@ EXPORT_SYMBOL(block_sync_page);
 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);
diff --git a/trunk/include/linux/buffer_head.h b/trunk/include/linux/buffer_head.h
index fb7e9b7ccbe3..737e407d0cd1 100644
--- a/trunk/include/linux/buffer_head.h
+++ b/trunk/include/linux/buffer_head.h
@@ -149,7 +149,6 @@ void create_empty_buffers(struct page *, unsigned long,
 			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_truncate_page(struct address_space *, loff_t);
 int nobh_writepage(struct page *page, get_block_t *get_block,
                         struct writeback_control *wbc);
 
+void buffer_init(void);
 
 /*
  * inline definitions
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 80af1a52485f..0d57f6ccb63a 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -48,6 +48,7 @@
 #include <linux/mempolicy.h>
 #include <linux/key.h>
 #include <linux/unwind.h>
+#include <linux/buffer_head.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -80,7 +81,6 @@ extern void mca_init(void);
 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);