The patch titled fs/buffer.c: possible cleanups has been added to the -mm tree. Its filename is fs-bufferc-possible-cleanups.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this From: Adrian Bunk <bunk@xxxxxxxxx> - 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> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/buffer.c | 3 +-- include/linux/buffer_head.h | 2 +- init/main.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff -puN fs/buffer.c~fs-bufferc-possible-cleanups fs/buffer.c --- 25/fs/buffer.c~fs-bufferc-possible-cleanups Mon May 8 12:05:11 2006 +++ 25-akpm/fs/buffer.c Mon May 8 12:05:11 2006 @@ -566,7 +566,7 @@ still_busy: * 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_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 -puN include/linux/buffer_head.h~fs-bufferc-possible-cleanups include/linux/buffer_head.h --- 25/include/linux/buffer_head.h~fs-bufferc-possible-cleanups Mon May 8 12:05:11 2006 +++ 25-akpm/include/linux/buffer_head.h Mon May 8 12:05:11 2006 @@ -149,7 +149,6 @@ void create_empty_buffers(struct page *, 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_sp int nobh_writepage(struct page *page, get_block_t *get_block, struct writeback_control *wbc); +void buffer_init(void); /* * inline definitions diff -puN init/main.c~fs-bufferc-possible-cleanups init/main.c --- 25/init/main.c~fs-bufferc-possible-cleanups Mon May 8 12:05:11 2006 +++ 25-akpm/init/main.c Mon May 8 12:05:11 2006 @@ -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 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); _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch git-acpi.patch acpiphp-use-new-dock-driver-fix.patch git-dvb.patch git-gfs2.patch git-intelfb.patch drivers-char-hw_randomc-remove-asserts.patch git-nfs.patch git-ocfs2.patch gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch git-scsi-rc-fixes.patch drivers-scsi-aic7xxx-possible-cleanups.patch drivers-scsi-small-cleanups.patch drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch drivers-scsi-gdthc-make-__gdth_execute-static.patch drivers-scsi-qla2xxx-make-some-functions-static.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch remove-drivers-scsi-constantscscsi_print_req_sense.patch drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch drivers-scsi-aic7xxx-possible-cleanups-2.patch ieee80211_wxc-remove-dead-code.patch swsusp-rework-memory-shrinker-rev-2-fix.patch acx1xx-wireless-driver.patch arch-i386-kernel-apicc-make-modern_apic-static.patch kernel-power-snapshotc-cleanups.patch remove-fs-jffs2-ioctlc.patch fs-locksc-make-posix_locks_deadlock-static.patch remove-config_parport_arc-drivers-parport-parport_arcc.patch fs-fat-miscc-unexport-fat_sync_bhs.patch the-scheduled-unexport-of-insert_resource.patch fs-bufferc-possible-cleanups.patch time-i386-clocksource-drivers.patch reiser4.patch fs-reiser4-misc-cleanups.patch fbdev-cleanup-the-config_video_select-mess.patch fbdev-remove-duplicate-includes.patch md-make-md_print_devices-static.patch nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch slab-cache-shrinker-statistics.patch i386-enable-4k-stacks-by-default.patch mutex-subsystem-synchro-test-module.patch drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch x86_64-unexport-ia32_sys_call_table.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html