Re: 2.6.19-rc2-mm1

Andrew Morton
2006-10-17T18:36:27Z

On Tue, 17 Oct 2006 17:45:29 +0200
Cedric Le Goater <clg@fr.ibm.com> wrote:

> > +mm-fix-pagecache-write-deadlocks.patch
>
> filemap_xip.c needs a fix also.
>
> Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
> ---
> mm/filemap_xip.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: 2.6.19-rc2-mm1/mm/filemap_xip.c
> ===================================================================
> --- 2.6.19-rc2-mm1.orig/mm/filemap_xip.c
> +++ 2.6.19-rc2-mm1/mm/filemap_xip.c
> @@ -317,7 +317,7 @@ __xip_file_write(struct file *filp, cons
> break;
> }
>
> - copied = filemap_copy_from_user(page, offset, buf, bytes);
> + copied = filemap_copy_from_user_atomic(page, offset, buf, bytes);
> flush_dcache_page(page);
> if (likely(copied > 0)) {
> status = copied;

<looks>

I think it might actually be that simple. I expected a lot more fuss than
that.