mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

unix: Generalize get_fle_for_scm()

Browse Source 
This adds a new argument and changes debug print
(it will be used for any fle, not only for scm).

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2018-01-30 18:41:39 +03:00
committed by Andrei Vagin
parent 6d1bf25e94
commit d809a5579a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
criu/sk-unix.c
View File

@@ -842,8 +842,8 @@ static struct unix_sk_info *find_queuer_for(int id)
return NULL; return NULL;
} }
static struct fdinfo_list_entry *get_fle_for_scm(struct file_desc *tgt, static struct fdinfo_list_entry *get_fle_for_task(struct file_desc *tgt,
struct pstree_item *owner) struct pstree_item *owner, bool force_master)
{ {
struct fdinfo_list_entry *fle; struct fdinfo_list_entry *fle;
FdinfoEntry *e = NULL; FdinfoEntry *e = NULL;
@@ -865,7 +865,7 @@ static struct fdinfo_list_entry *get_fle_for_scm(struct file_desc *tgt,
* we're another user of it. * we're another user of it.
*/ */
fd = find_unused_fd(owner, -1); fd = find_unused_fd(owner, -1);
pr_info("`- will add SCM-only %d fd\n", fd); pr_info("`- will add fake %d fd\n", fd);
if (e != NULL) { if (e != NULL) {
e = dup_fdinfo(e, fd, 0); e = dup_fdinfo(e, fd, 0);
@@ -895,7 +895,7 @@ static struct fdinfo_list_entry *get_fle_for_scm(struct file_desc *tgt,
* Make this fle fake, so that files collecting engine * Make this fle fake, so that files collecting engine
* closes them at the end. * closes them at the end.
*/ */
return collect_fd_to(vpid(owner), e, rsti(owner), tgt, true, false); return collect_fd_to(vpid(owner), e, rsti(owner), tgt, true, force_master);
} }
int unix_note_scm_rights(int id_for, uint32_t *file_ids, int *fds, int n_ids) int unix_note_scm_rights(int id_for, uint32_t *file_ids, int *fds, int n_ids)
@@ -936,7 +936,7 @@ int unix_note_scm_rights(int id_for, uint32_t *file_ids, int *fds, int n_ids)
if (!sfle) if (!sfle)
return -1; return -1;
sfle->fle = get_fle_for_scm(tgt, owner); sfle->fle = get_fle_for_task(tgt, owner, false);
if (!sfle->fle) { if (!sfle->fle) {
pr_err("Can't request new fle for scm\n"); pr_err("Can't request new fle for scm\n");
xfree(sfle); xfree(sfle);