projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
[cascardo/linux.git]
/
net
/
ipv4
/
tcp_memcontrol.c
diff --git
a/net/ipv4/tcp_memcontrol.c
b/net/ipv4/tcp_memcontrol.c
index
8a57d79
..
559d4ae
100644
(file)
--- a/
net/ipv4/tcp_memcontrol.c
+++ b/
net/ipv4/tcp_memcontrol.c
@@
-87,8
+87,8
@@
static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)
if (!cg_proto)
return -EINVAL;
if (!cg_proto)
return -EINVAL;
- if (val > RES
OURCE
_MAX)
- val = RES
OURCE
_MAX;
+ if (val > RES
_COUNTER
_MAX)
+ val = RES
_COUNTER
_MAX;
tcp = tcp_from_cgproto(cg_proto);
tcp = tcp_from_cgproto(cg_proto);
@@
-101,9
+101,9
@@
static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)
tcp->tcp_prot_mem[i] = min_t(long, val >> PAGE_SHIFT,
net->ipv4.sysctl_tcp_mem[i]);
tcp->tcp_prot_mem[i] = min_t(long, val >> PAGE_SHIFT,
net->ipv4.sysctl_tcp_mem[i]);
- if (val == RES
OURCE
_MAX)
+ if (val == RES
_COUNTER
_MAX)
clear_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
clear_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
- else if (val != RES
OURCE
_MAX) {
+ else if (val != RES
_COUNTER
_MAX) {
/*
* The active bit needs to be written after the static_key
* update. This is what guarantees that the socket activation
/*
* The active bit needs to be written after the static_key
* update. This is what guarantees that the socket activation
@@
-187,7
+187,7
@@
static u64 tcp_cgroup_read(struct cgroup_subsys_state *css, struct cftype *cft)
switch (cft->private) {
case RES_LIMIT:
switch (cft->private) {
case RES_LIMIT:
- val = tcp_read_stat(memcg, RES_LIMIT, RES
OURCE
_MAX);
+ val = tcp_read_stat(memcg, RES_LIMIT, RES
_COUNTER
_MAX);
break;
case RES_USAGE:
val = tcp_read_usage(memcg);
break;
case RES_USAGE:
val = tcp_read_usage(memcg);