mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

files: Populate file_desc::setns_userns

Browse Source 
Do it here once to use cached value later.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2017-06-07 14:28:21 +03:00
committed by Andrei Vagin
parent eecdaebaee
commit 80c0c63b41
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
criu/files.c
View File

@@ -73,12 +73,17 @@ void file_desc_init(struct file_desc *d, u32 id, struct file_desc_ops *ops)
d->id = id; d->id = id;
d->ops = ops; d->ops = ops;
d->setns_userns = NULL;
} }
int file_desc_add(struct file_desc *d, u32 id, struct file_desc_ops *ops) int file_desc_add(struct file_desc *d, u32 id, struct file_desc_ops *ops)
{ {
uint32_t file_user_ns;
file_desc_init(d, id, ops); file_desc_init(d, id, ops);
hlist_add_head(&d->hash, &file_desc_hash[id % FDESC_HASH_SIZE]); hlist_add_head(&d->hash, &file_desc_hash[id % FDESC_HASH_SIZE]);
if (d->ops->get_user_ns) {
d->ops->get_user_ns(d, &file_user_ns, &d->setns_userns);
}
return 0; /* this is to make tail-calls in collect_one_foo look nice */ return 0; /* this is to make tail-calls in collect_one_foo look nice */
} }

1
criu/include/files.h
View File

@@ -131,6 +131,7 @@ struct file_desc {
struct file_desc_ops *ops; /* Associated operations */ struct file_desc_ops *ops; /* Associated operations */
struct list_head fake_master_list;/* To chain in the list of file_desc, which don't struct list_head fake_master_list;/* To chain in the list of file_desc, which don't
have a fle in a task, that having permissions */ have a fle in a task, that having permissions */
struct ns_id *setns_userns; /* Minimal user_ns to be able to restore this file */
}; };
struct fdtype_ops { struct fdtype_ops {