[PATCH 4/8] btrfs: Warn if direct reclaim tries to writeback pages
From: Mel Gorman <mgorman@suse.de>
Date: 2011-07-21 16:29:17
Also in:
linux-xfs, lkml
Subsystem:
btrfs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Chris Mason, David Sterba, Alexander Viro, Christian Brauner, Linus Torvalds
Direct reclaim should never writeback pages. Warn if an attempt is made. By rights, btrfs should be allowing writepage from kswapd if it is failing to reclaim pages by any other means but it's outside the scope of this patch. Signed-off-by: Mel Gorman <mgorman@suse.de> --- fs/btrfs/disk-io.c | 2 ++ fs/btrfs/inode.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 1ac8db5d..cc9c9cf 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c@@ -829,6 +829,8 @@ static int btree_writepage(struct page *page, struct writeback_control *wbc) tree = &BTRFS_I(page->mapping->host)->io_tree; if (!(current->flags & PF_MEMALLOC)) { + WARN_ON_ONCE((current->flags & (PF_MEMALLOC|PF_KSWAPD)) == + PF_MEMALLOC); return extent_write_full_page(tree, page, btree_get_extent, wbc); }
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 3601f0a..07d6c27 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c@@ -6259,6 +6259,8 @@ static int btrfs_writepage(struct page *page, struct writeback_control *wbc) if (current->flags & PF_MEMALLOC) { + WARN_ON_ONCE((current->flags & (PF_MEMALLOC|PF_KSWAPD)) == + PF_MEMALLOC); redirty_page_for_writepage(wbc, page); unlock_page(page); return 0;
--
1.7.3.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>