The commit is pushed to "branch-rh7-3.10.0-229.7.2-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.6.6
------>
commit fb50f65f2c49b6a73e369153a660ff17227223b0
Author: Vladimir Davydov <vdavy...@parallels.com>
Date: Thu Sep 3 14:34:34 2015 +0400
ub: zap ub_tmpfs_respages
It is always 0 in both Vz7 and PCS6, so drop it.
Signed-off-by: Vladimir Davydov <vdavy...@parallels.com>
---
include/bc/beancounter.h | 7 -------
kernel/bc/beancounter.c | 1 -
kernel/bc/vm_pages.c | 19 -------------------
3 files changed, 27 deletions(-)
diff --git a/include/bc/beancounter.h b/include/bc/beancounter.h
index ec2ba18..a6241f6 100644
--- a/include/bc/beancounter.h
+++ b/include/bc/beancounter.h
@@ -50,10 +50,6 @@
struct task_beancounter;
-struct page_private {
- unsigned long ubp_tmpfs_respages;
-};
-
struct ub_percpu_struct {
int dirty_pages;
int writeback_pages;
@@ -106,9 +102,6 @@ struct user_beancounter {
struct ratelimit_state ub_ratelimit;
- struct page_private ppriv;
-#define ub_tmpfs_respages ppriv.ubp_tmpfs_respages
-
atomic_long_t dirty_pages;
atomic_long_t writeback_pages;
atomic_long_t wb_requests;
diff --git a/kernel/bc/beancounter.c b/kernel/bc/beancounter.c
index 8edef0d..d0ab65a 100644
--- a/kernel/bc/beancounter.c
+++ b/kernel/bc/beancounter.c
@@ -492,7 +492,6 @@ static inline int bc_verify_held(struct user_beancounter
*ub)
__ub_stat_get(ub, dirty_pages));
clean &= verify_res(ub, "writeback_pages",
__ub_stat_get(ub, writeback_pages));
- clean &= verify_res(ub, "tmpfs_respages", ub->ub_tmpfs_respages);
return clean;
}
diff --git a/kernel/bc/vm_pages.c b/kernel/bc/vm_pages.c
index 23e8742..7529899 100644
--- a/kernel/bc/vm_pages.c
+++ b/kernel/bc/vm_pages.c
@@ -119,22 +119,6 @@ void ub_lockedshm_uncharge(struct shmem_inode_info *shi,
unsigned long size)
uncharge_beancounter(ub, UB_LOCKEDPAGES, size >> PAGE_SHIFT);
}
-static inline void do_ub_tmpfs_respages_sub(struct user_beancounter *ub,
- unsigned long size)
-{
- unsigned long flags;
-
- spin_lock_irqsave(&ub->ub_lock, flags);
- /* catch possible overflow */
- if (ub->ub_tmpfs_respages < size) {
- uncharge_warn(ub, "tmpfs_respages",
- size, ub->ub_tmpfs_respages);
- size = ub->ub_tmpfs_respages;
- }
- ub->ub_tmpfs_respages -= size;
- spin_unlock_irqrestore(&ub->ub_lock, flags);
-}
-
static int bc_fill_sysinfo(struct user_beancounter *ub,
unsigned long meminfo_val, struct sysinfo *si)
{
@@ -269,9 +253,6 @@ static int bc_vmaux_show(struct seq_file *f, void *v)
ub_sync_memcg(ub);
- seq_printf(f, bc_proc_lu_fmt, "tmpfs_respages",
- ub->ub_tmpfs_respages);
-
seq_printf(f, bc_proc_lu_fmt, "ram", ub->ub_parms[UB_PHYSPAGES].held);
return 0;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
