From: Kirill Tkhai
Customize /proc/swaps when showing from !ve_is_super.
Extracted from "Initial patch".
Signed-off-by: Kirill Tkhai
(cherry picked from vz7 commit 88c087f1fdb4b0f7934804269df36035ab6b83eb)
Signed-off-by: Konstantin Khorenko
vz8 rebase changes:
* virtinfo notifier substituted by direct call to si_meminfo_ve().
---
mm/swapfile.c | 36 +++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2fd2a06b09f9..ebb524dcf2e4 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2897,11 +2897,36 @@ static const struct seq_operations swaps_op = {
.show = swap_show
};
+extern void si_meminfo_ve(struct sysinfo *si, struct ve_struct *ve);
+
+static int swap_show_ve(struct seq_file *swap, void *v)
+{
+ struct ve_struct *ve = get_exec_env();
+ struct sysinfo si;
+
+ si_meminfo_ve(, ve);
+
+ seq_printf(swap, "Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n");
+ if (!si.totalswap)
+ goto out;
+ seq_printf(swap, "%-40s%s\t%lu\t%lu\t%d\n",
+ "/dev/null",
+ "partition",
+ si.totalswap << (PAGE_SHIFT - 10),
+ (si.totalswap - si.freeswap) << (PAGE_SHIFT - 10),
+ -1);
+out:
+ return 0;
+}
+
static int swaps_open(struct inode *inode, struct file *file)
{
struct seq_file *seq;
int ret;
+ if (!ve_is_super(get_exec_env()))
+ return single_open(file, _show_ve, NULL);
+
ret = seq_open(file, _op);
if (ret)
return ret;
@@ -2911,11 +2936,20 @@ static int swaps_open(struct inode *inode, struct file
*file)
return 0;
}
+static int swaps_release(struct inode *inode, struct file *file)
+{
+ struct seq_file *f = file->private_data;
+
+ if (f->op != _op)
+ return single_release(inode, file);
+ return seq_release(inode, file);
+}
+
static const struct file_operations proc_swaps_operations = {
.open = swaps_open,
.read = seq_read,
.llseek = seq_lseek,
- .release= seq_release,
+ .release= swaps_release,
.poll = swaps_poll,
};
--
2.28.0
___
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
