Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 10:16:41 +00:00
Code Issues Projects Releases Wiki Activity

rlimit: Move CR_FD_RLIMIT out of _CR_FD_TASK, v2

Browse source 
On Thu, Mar 13, 2014 at 02:30:50PM +0400, Cyrill Gorcunov wrote:
>
> This image is deprecated now so move it out of
> _CR_FD_TASK thus we won't be even generating it
> on the dump.
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

Updated

>From cb9c3953beac7d42de80635e7a6e537cc867c479 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@openvz.org>
Date: Thu, 13 Mar 2014 14:24:50 +0400
Subject: [PATCH 7/7] rlimit: Move CR_FD_RLIMIT out of _CR_FD_TASK

This image is deprecated now so move it out of
_CR_FD_TASK thus we won't be even generating it
on the dump.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov 2014-03-13 16:17:30 +04:00 • committed by Pavel Emelyanov
parent 79a88ae0dd
commit bf76aa2068
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cr-show.c
View file

@ -443,6 +443,16 @@ static int cr_show_pstree_item(struct pstree_item *item)
cr_parse_fd(fdset_fd(cr_fdset, i), fdset_template[i].magic);
}
i = open_image(CR_FD_RLIMIT, O_SHOW | O_OPT, item->pid.virt);
if (i >= 0) {
pr_msg("* ");
pr_msg(fdset_template[CR_FD_RLIMIT].fmt, item->pid.virt);
pr_msg(":\n");
cr_parse_fd(i, RLIMIT_MAGIC);
close(i);
}
if (pb_read_one(fdset_fd(cr_fdset, CR_FD_IDS), &ids, PB_IDS) > 0) {
i = open_image(CR_FD_FDINFO, O_SHOW, ids->files_id);
if (i >= 0) {

2
include/image-desc.h
View file

@ -20,7 +20,6 @@ enum {
CR_FD_POSIX_TIMERS,
CR_FD_CREDS,
CR_FD_FS,
CR_FD_RLIMIT,
CR_FD_SIGNAL,
_CR_FD_TASK_TO,
@ -86,6 +85,7 @@ enum {
CR_FD_VMAS,
CR_FD_PAGES_OLD,
CR_FD_SHM_PAGES_OLD,
CR_FD_RLIMIT,
CR_FD_IRMAP_CACHE,