projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: vmscan: shrink_slab: rename max_pass -> freeable
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index
7a13f6a
..
c2cc7c9
100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-192,9
+192,11
@@
static int filemap_check_errors(struct address_space *mapping)
{
int ret = 0;
/* Check for outstanding write errors */
{
int ret = 0;
/* Check for outstanding write errors */
- if (test_and_clear_bit(AS_ENOSPC, &mapping->flags))
+ if (test_bit(AS_ENOSPC, &mapping->flags) &&
+ test_and_clear_bit(AS_ENOSPC, &mapping->flags))
ret = -ENOSPC;
ret = -ENOSPC;
- if (test_and_clear_bit(AS_EIO, &mapping->flags))
+ if (test_bit(AS_EIO, &mapping->flags) &&
+ test_and_clear_bit(AS_EIO, &mapping->flags))
ret = -EIO;
return ret;
}
ret = -EIO;
return ret;
}
@@
-520,10
+522,10
@@
struct page *__page_cache_alloc(gfp_t gfp)
if (cpuset_do_page_mem_spread()) {
unsigned int cpuset_mems_cookie;
do {
if (cpuset_do_page_mem_spread()) {
unsigned int cpuset_mems_cookie;
do {
- cpuset_mems_cookie =
get_mems_allowed
();
+ cpuset_mems_cookie =
read_mems_allowed_begin
();
n = cpuset_mem_spread_node();
page = alloc_pages_exact_node(n, gfp, 0);
n = cpuset_mem_spread_node();
page = alloc_pages_exact_node(n, gfp, 0);
- } while (!p
ut_mems_allowed(cpuset_mems_cookie) && !page
);
+ } while (!p
age && read_mems_allowed_retry(cpuset_mems_cookie)
);
return page;
}
return page;
}