diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-27 05:53:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:38 -0400 |
commit | b6cd0b772dcc5dc9b4c03d53946474dee399fa72 (patch) | |
tree | 09ef125f7595f73ba256177f894d6c341074ff5b | |
parent | a7807a32bbb027ab9955b96734fdc7f1e6497a9f (diff) |
[PATCH] fs/buffer.c: 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@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | fs/buffer.c | 3 | ||||
-rw-r--r-- | include/linux/buffer_head.h | 2 | ||||
-rw-r--r-- | init/main.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 373bb6292bdc..f23bb647db47 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -564,7 +564,7 @@ still_busy: | |||
564 | * Completion handler for block_write_full_page() - pages which are unlocked | 564 | * Completion handler for block_write_full_page() - pages which are unlocked |
565 | * during I/O, and which have PageWriteback cleared upon I/O completion. | 565 | * during I/O, and which have PageWriteback cleared upon I/O completion. |
566 | */ | 566 | */ |
567 | void end_buffer_async_write(struct buffer_head *bh, int uptodate) | 567 | static void end_buffer_async_write(struct buffer_head *bh, int uptodate) |
568 | { | 568 | { |
569 | char b[BDEVNAME_SIZE]; | 569 | char b[BDEVNAME_SIZE]; |
570 | unsigned long flags; | 570 | unsigned long flags; |
@@ -3166,7 +3166,6 @@ EXPORT_SYMBOL(block_sync_page); | |||
3166 | EXPORT_SYMBOL(block_truncate_page); | 3166 | EXPORT_SYMBOL(block_truncate_page); |
3167 | EXPORT_SYMBOL(block_write_full_page); | 3167 | EXPORT_SYMBOL(block_write_full_page); |
3168 | EXPORT_SYMBOL(cont_prepare_write); | 3168 | EXPORT_SYMBOL(cont_prepare_write); |
3169 | EXPORT_SYMBOL(end_buffer_async_write); | ||
3170 | EXPORT_SYMBOL(end_buffer_read_sync); | 3169 | EXPORT_SYMBOL(end_buffer_read_sync); |
3171 | EXPORT_SYMBOL(end_buffer_write_sync); | 3170 | EXPORT_SYMBOL(end_buffer_write_sync); |
3172 | EXPORT_SYMBOL(file_fsync); | 3171 | EXPORT_SYMBOL(file_fsync); |
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index fb7e9b7ccbe3..737e407d0cd1 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
@@ -149,7 +149,6 @@ void create_empty_buffers(struct page *, unsigned long, | |||
149 | unsigned long b_state); | 149 | unsigned long b_state); |
150 | void end_buffer_read_sync(struct buffer_head *bh, int uptodate); | 150 | void end_buffer_read_sync(struct buffer_head *bh, int uptodate); |
151 | void end_buffer_write_sync(struct buffer_head *bh, int uptodate); | 151 | void end_buffer_write_sync(struct buffer_head *bh, int uptodate); |
152 | void end_buffer_async_write(struct buffer_head *bh, int uptodate); | ||
153 | 152 | ||
154 | /* Things to do with buffers at mapping->private_list */ | 153 | /* Things to do with buffers at mapping->private_list */ |
155 | void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode); | 154 | 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); | |||
214 | int nobh_writepage(struct page *page, get_block_t *get_block, | 213 | int nobh_writepage(struct page *page, get_block_t *get_block, |
215 | struct writeback_control *wbc); | 214 | struct writeback_control *wbc); |
216 | 215 | ||
216 | void buffer_init(void); | ||
217 | 217 | ||
218 | /* | 218 | /* |
219 | * inline definitions | 219 | * inline definitions |
diff --git a/init/main.c b/init/main.c index 80af1a52485f..0d57f6ccb63a 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <linux/mempolicy.h> | 48 | #include <linux/mempolicy.h> |
49 | #include <linux/key.h> | 49 | #include <linux/key.h> |
50 | #include <linux/unwind.h> | 50 | #include <linux/unwind.h> |
51 | #include <linux/buffer_head.h> | ||
51 | 52 | ||
52 | #include <asm/io.h> | 53 | #include <asm/io.h> |
53 | #include <asm/bugs.h> | 54 | #include <asm/bugs.h> |
@@ -80,7 +81,6 @@ extern void mca_init(void); | |||
80 | extern void sbus_init(void); | 81 | extern void sbus_init(void); |
81 | extern void sysctl_init(void); | 82 | extern void sysctl_init(void); |
82 | extern void signals_init(void); | 83 | extern void signals_init(void); |
83 | extern void buffer_init(void); | ||
84 | extern void pidhash_init(void); | 84 | extern void pidhash_init(void); |
85 | extern void pidmap_init(void); | 85 | extern void pidmap_init(void); |
86 | extern void prio_tree_init(void); | 86 | extern void prio_tree_init(void); |