From fc99ba942c1eccda6f642d1b7d8e8bb8aedf70a0 Mon Sep 17 00:00:00 2001 From: Mel Gorman Date: Mon, 31 Oct 2011 17:07:45 -0700 Subject: [PATCH] --- yaml --- r: 272126 b: refs/heads/master c: 94054fa3fca1fd78db02cb3d68d5627120f0a1d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_aops.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 52d08cc2f9eb..037c1b35a7bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a18bba061c789f5815c3efc3c80e6ac269911964 +refs/heads/master: 94054fa3fca1fd78db02cb3d68d5627120f0a1d4 diff --git a/trunk/fs/xfs/xfs_aops.c b/trunk/fs/xfs/xfs_aops.c index 11b2aad982d4..33b13310ee0c 100644 --- a/trunk/fs/xfs/xfs_aops.c +++ b/trunk/fs/xfs/xfs_aops.c @@ -902,11 +902,11 @@ xfs_vm_writepage( * random callers for direct reclaim or memcg reclaim. We explicitly * allow reclaim from kswapd as the stack usage there is relatively low. * - * This should really be done by the core VM, but until that happens - * filesystems like XFS, btrfs and ext4 have to take care of this - * by themselves. + * This should never happen except in the case of a VM regression so + * warn about it. */ - if ((current->flags & (PF_MEMALLOC|PF_KSWAPD)) == PF_MEMALLOC) + if (WARN_ON_ONCE((current->flags & (PF_MEMALLOC|PF_KSWAPD)) == + PF_MEMALLOC)) goto redirty; /*