The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.13
------>
commit 625e4b639c0ac473bea2dc49b50b3efaa00abcf8
Author: Konstantin Khorenko <khore...@virtuozzo.com>
Date: Tue Jun 16 20:32:51 2015 +0400
Revert "mm/fs: Port diff-mm-debug-memallocation-caused-fs-reentrance"
This reverts commit 255427905323ac97a3c9b2d5acb2bf21ea2b31f6.
The debug in question works fine and we know about the problem,
and it will be fixed once we backport ms commit
4fdb5543183d027a19805b72025b859af73d0863.
Until then we revert the debug in order not to taint kernel and
let tests run.
We'll get the debug back once we fix the issue
https://jira.sw.ru/browse/PSBM-34112
Signed-off-by: Konstantin Khorenko <khore...@virtuozzo.com>
---
mm/page_alloc.c | 1 -
mm/slab.c | 2 --
mm/slub.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8fbe108..627677c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2690,7 +2690,6 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
lockdep_trace_alloc(gfp_mask);
might_sleep_if(gfp_mask & __GFP_WAIT);
- WARN_ON((gfp_mask & __GFP_FS) && current->journal_info);
if (should_fail_alloc_page(gfp_mask, order))
return NULL;
diff --git a/mm/slab.c b/mm/slab.c
index 3c82384..d647f42 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3343,7 +3343,6 @@ slab_alloc_node(struct kmem_cache *cachep, gfp_t flags,
int nodeid,
flags &= gfp_allowed_mask;
lockdep_trace_alloc(flags);
- WARN_ON((flags & __GFP_FS) && current->journal_info);
if (slab_should_failslab(cachep, flags))
return NULL;
@@ -3432,7 +3431,6 @@ slab_alloc(struct kmem_cache *cachep, gfp_t flags,
unsigned long caller)
flags &= gfp_allowed_mask;
lockdep_trace_alloc(flags);
- WARN_ON((flags & __GFP_FS) && current->journal_info);
if (slab_should_failslab(cachep, flags))
return NULL;
diff --git a/mm/slub.c b/mm/slub.c
index 347650c..6d5957a 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -936,7 +936,6 @@ static inline int slab_pre_alloc_hook(struct kmem_cache *s,
gfp_t flags)
flags &= gfp_allowed_mask;
lockdep_trace_alloc(flags);
might_sleep_if(flags & __GFP_WAIT);
- WARN_ON((flags & __GFP_FS) && current->journal_info);
return should_failslab(s->object_size, flags, s->flags);
}
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
