2004-03-07 16:16:09

by Olaf Hering

Subject: linux-2.5 cset 1.1654.1.2 xfs filemap_flush() unresolved

filemap_flush() is not an exported symbol, at least not in my tree.


> ChangeSet
> 1.1654.1.2 04/03/06 14:47:10 [email protected] +1 -0
> [XFS] Fix out-of-space deadlock when flushing delalloc data with pages locked under write.
>
> SGI Modid: xfs-linux:xfs-kern:167948a
>
> fs/xfs/linux/xfs_super.c
> 1.70 04/03/06 14:46:51 [email protected] +1 -1
> [XFS] Fix out-of-space deadlock when flushing delalloc data with pages locked under write.
>
> .........................................................................
> # This is a BitKeeper generated patch for the following project:
> # Project Name: Linux kernel tree
> # This patch format is intended for GNU patch command version 2.5 or higher.
> # This patch includes the following deltas:
> # ChangeSet 1.1654.1.1 -> 1.1654.1.2
> # fs/xfs/linux/xfs_super.c 1.69 -> 1.70
> #
> # The following is the BitKeeper ChangeSet Log
> # --------------------------------------------
> # 04/03/06 [email protected] 1.1654.1.2
> # [XFS] Fix out-of-space deadlock when flushing delalloc data with pages locked under write.
> #
> # SGI Modid: xfs-linux:xfs-kern:167948a
> # --------------------------------------------
> #
> diff -Nru a/fs/xfs/linux/xfs_super.c b/fs/xfs/linux/xfs_super.c
> --- a/fs/xfs/linux/xfs_super.c Sun Mar 7 06:25:54 2004
> +++ b/fs/xfs/linux/xfs_super.c Sun Mar 7 06:25:54 2004
> @@ -247,7 +247,7 @@
> {
> struct inode *inode = LINVFS_GET_IP(XFS_ITOV(ip));
>
> - filemap_fdatawrite(inode->i_mapping);
> + filemap_flush(inode->i_mapping);
> }
>
> void
> .........................................................................
> # vim: syntax=diff
>

--
USB is for mice, FireWire is for men!

sUse lINUX ag, nÜRNBERG

2004-03-08 08:53:00

by Nathan Scott

Subject: Re: linux-2.5 cset 1.1654.1.2 xfs filemap_flush() unresolved

On Sun, Mar 07, 2004 at 05:15:50PM +0100, Olaf Hering wrote:
>
> filemap_flush() is not an exported symbol, at least not in my tree.
>

Thanks Olaf,

Trivial fix follows (for modular XFS builds).

cheers.

--
Nathan


--- mm/filemap.c.orig 2004-03-08 19:44:18.904099904 +1100
+++ mm/filemap.c 2004-03-08 19:44:45.641035272 +1100
@@ -168,6 +168,8 @@
return __filemap_fdatawrite(mapping, WB_SYNC_NONE);
}

+EXPORT_SYMBOL(filemap_flush);
+
/**
* filemap_fdatawait - walk the list of locked pages of the given address
* space and wait for all of them.