diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 12:06:30 -0500 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /mm/balloon_compaction.c | |
| parent | 5b095e99928cc13332d364f7cca7a9ca684369b4 (diff) | |
| parent | 093a1468b6edb0e568be7311b8d2228d205702db (diff) | |
| download | op-kernel-dev-56429e9b3be567a173bd05f5594faf8522c34d3a.zip op-kernel-dev-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.gz | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'mm/balloon_compaction.c')
| -rw-r--r-- | mm/balloon_compaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index b3cbe19..fcad832 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -68,11 +68,13 @@ struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info) * to be released by the balloon driver. */ if (trylock_page(page)) { +#ifdef CONFIG_BALLOON_COMPACTION if (!PagePrivate(page)) { /* raced with isolation */ unlock_page(page); continue; } +#endif spin_lock_irqsave(&b_dev_info->pages_lock, flags); balloon_page_delete(page); __count_vm_event(BALLOON_DEFLATE); |
