2.5.14 -- fs/fs.o: In function `end_buffer_read_file_async': undefined reference to `clear_buffer_async'

2.5.14 -- fs/fs.o: In function `end_buffer_read_file_async': undefined reference to `clear_buffer_async'

[Miles Lane]

fs/fs.o: In function `end_buffer_read_file_async':
fs/fs.o(.text+0x705a4): undefined reference to `clear_buffer_async'
fs/fs.o(.text+0x705c9): undefined reference to `buffer_async'
fs/fs.o: In function `ntfs_file_read_block':
fs/fs.o(.text+0x70a5c): undefined reference to `set_buffer_async'
fs/fs.o: In function `end_buffer_read_mftbmp_async':
fs/fs.o(.text+0x70e34): undefined reference to `clear_buffer_async'
fs/fs.o(.text+0x70e59): undefined reference to `buffer_async'
fs/fs.o: In function `ntfs_mftbmp_readpage':
fs/fs.o(.text+0x7125c): undefined reference to `set_buffer_async'
fs/fs.o: In function `end_buffer_read_mst_async':
fs/fs.o(.text+0x71411): undefined reference to `clear_buffer_async'
fs/fs.o(.text+0x71439): undefined reference to `buffer_async'
fs/fs.o: In function `ntfs_mst_readpage':
fs/fs.o(.text+0x719fc): undefined reference to `set_buffer_async'
make: *** [vmlinux] Error 1

CONFIG_X86=y
CONFIG_ISA=y
CONFIG_UID16=y
CONFIG_MK7=y

#
# File systems
#
CONFIG_AUTOFS4_FS=y
CONFIG_REISERFS_FS=y
CONFIG_REISERFS_CHECK=y
CONFIG_REISERFS_PROC_INFO=y
CONFIG_HFS_FS=y
CONFIG_EXT3_FS=y
CONFIG_JBD=y
CONFIG_JBD_DEBUG=y
CONFIG_FAT_FS=m
CONFIG_VFAT_FS=m
CONFIG_TMPFS=y
CONFIG_RAMFS=y
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
CONFIG_JFS_FS=y
CONFIG_JFS_DEBUG=y
CONFIG_JFS_STATISTICS=y
CONFIG_NTFS_FS=y
CONFIG_NTFS_DEBUG=y
CONFIG_PROC_FS=y
CONFIG_DEVPTS_FS=y
CONFIG_EXT2_FS=y
CONFIG_UDF_FS=y

Re: 2.5.14 -- fs/fs.o: In function `end_buffer_read_file_async': undefinedreference to `clear_buffer_async'

[Andrew Morton]

Miles Lane wrote:
> 
> fs/fs.o: In function `end_buffer_read_file_async':
> fs/fs.o(.text+0x705a4): undefined reference to `clear_buffer_async'

oops.  I broke it again.  This is probably a subconcious reaction
to the "NT" thing.   Apologies.

--- 2.5.14/fs/ntfs/aops.c~ntfs	Sun May  5 23:33:05 2002
+++ 2.5.14-akpm/fs/ntfs/aops.c	Sun May  5 23:34:34 2002
@@ -76,13 +76,13 @@ static void end_buffer_read_file_async(s
 		SetPageError(page);
 
 	spin_lock_irqsave(&page_uptodate_lock, flags);
-	clear_buffer_async(bh);
+	clear_buffer_async_read(bh);
 	unlock_buffer(bh);
 
 	tmp = bh->b_this_page;
 	while (tmp != bh) {
 		if (buffer_locked(tmp)) {
-			if (buffer_async(tmp))
+			if (buffer_async_read(tmp))
 				goto still_busy;
 		} else if (!buffer_uptodate(tmp))
 			SetPageError(page);
@@ -218,7 +218,7 @@ handle_zblock:
 			struct buffer_head *tbh = arr[i];
 			lock_buffer(tbh);
 			tbh->b_end_io = end_buffer_read_file_async;
-			set_buffer_async(tbh);
+			set_buffer_async_read(tbh);
 		}
 		/* Finally, start i/o on the buffers. */
 		for (i = 0; i < nr; i++)
@@ -378,13 +378,13 @@ static void end_buffer_read_mftbmp_async
 		SetPageError(page);
 
 	spin_lock_irqsave(&page_uptodate_lock, flags);
-	clear_buffer_async(bh);
+	clear_buffer_async_read(bh);
 	unlock_buffer(bh);
 
 	tmp = bh->b_this_page;
 	while (tmp != bh) {
 		if (buffer_locked(tmp)) {
-			if (buffer_async(tmp))
+			if (buffer_async_read(tmp))
 				goto still_busy;
 		} else if (!buffer_uptodate(tmp))
 			SetPageError(page);
@@ -501,7 +501,7 @@ handle_zblock:
 			struct buffer_head *tbh = arr[i];
 			lock_buffer(tbh);
 			tbh->b_end_io = end_buffer_read_mftbmp_async;
-			set_buffer_async(tbh);
+			set_buffer_async_read(tbh);
 		}
 		/* Finally, start i/o on the buffers. */
 		for (i = 0; i < nr; i++)
@@ -574,13 +574,13 @@ static void end_buffer_read_mst_async(st
 		SetPageError(page);
 
 	spin_lock_irqsave(&page_uptodate_lock, flags);
-	clear_buffer_async(bh);
+	clear_buffer_async_read(bh);
 	unlock_buffer(bh);
 
 	tmp = bh->b_this_page;
 	while (tmp != bh) {
 		if (buffer_locked(tmp)) {
-			if (buffer_async(tmp))
+			if (buffer_async_read(tmp))
 				goto still_busy;
 		} else if (!buffer_uptodate(tmp))
 			SetPageError(page);
@@ -758,7 +758,7 @@ handle_zblock:
 			struct buffer_head *tbh = arr[i];
 			lock_buffer(tbh);
 			tbh->b_end_io = end_buffer_read_mst_async;
-			set_buffer_async(tbh);
+			set_buffer_async_read(tbh);
 		}
 		/* Finally, start i/o on the buffers. */
 		for (i = 0; i < nr; i++)


-