From a309f1d5b6438bb4bdb5acab513108165a2c9a64 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Thu, 14 Mar 2013 14:30:54 +0100 Subject: [PATCH] --- yaml --- r: 371050 b: refs/heads/master c: ff9a28f6c25d18a635abcab1f49db68108203dfb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_aops.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 92175e777f32..4ce06bb4ac7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19cb7e3854c9afe2ee968cbdd92293ec09e43bf3 +refs/heads/master: ff9a28f6c25d18a635abcab1f49db68108203dfb diff --git a/trunk/fs/xfs/xfs_aops.c b/trunk/fs/xfs/xfs_aops.c index 5f707e537171..3244c988d379 100644 --- a/trunk/fs/xfs/xfs_aops.c +++ b/trunk/fs/xfs/xfs_aops.c @@ -953,13 +953,13 @@ xfs_vm_writepage( unsigned offset_into_page = offset & (PAGE_CACHE_SIZE - 1); /* - * Just skip the page if it is fully outside i_size, e.g. due - * to a truncate operation that is in progress. + * Skip the page if it is fully outside i_size, e.g. due to a + * truncate operation that is in progress. We must redirty the + * page so that reclaim stops reclaiming it. Otherwise + * xfs_vm_releasepage() is called on it and gets confused. */ - if (page->index >= end_index + 1 || offset_into_page == 0) { - unlock_page(page); - return 0; - } + if (page->index >= end_index + 1 || offset_into_page == 0) + goto redirty; /* * The page straddles i_size. It must be zeroed out on each