projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
[linux-2.6-microblaze.git]
/
fs
/
buffer.c
diff --git
a/fs/buffer.c
b/fs/buffer.c
index
5a28a6a
..
23f6456
100644
(file)
--- a/
fs/buffer.c
+++ b/
fs/buffer.c
@@
-842,13
+842,13
@@
struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
struct buffer_head *bh, *head;
gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT;
long offset;
struct buffer_head *bh, *head;
gfp_t gfp = GFP_NOFS | __GFP_ACCOUNT;
long offset;
- struct mem_cgroup *memcg;
+ struct mem_cgroup *memcg
, *old_memcg
;
if (retry)
gfp |= __GFP_NOFAIL;
memcg = get_mem_cgroup_from_page(page);
if (retry)
gfp |= __GFP_NOFAIL;
memcg = get_mem_cgroup_from_page(page);
-
memalloc_us
e_memcg(memcg);
+
old_memcg = set_activ
e_memcg(memcg);
head = NULL;
offset = PAGE_SIZE;
head = NULL;
offset = PAGE_SIZE;
@@
-867,7
+867,7
@@
struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size,
set_bh_page(bh, page, offset);
}
out:
set_bh_page(bh, page, offset);
}
out:
-
memalloc_unuse_memcg(
);
+
set_active_memcg(old_memcg
);
mem_cgroup_put(memcg);
return head;
/*
mem_cgroup_put(memcg);
return head;
/*