Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[draft] support of bindmounted unix dgram sockets #1001

Draft
wants to merge 277 commits into
base: criu-dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
277 commits
Select commit Hold shift + click to select a range
36b628b
remote: Remove unused constants
rst0git Jun 14, 2018
1a8c654
crtools: Fix typo
rst0git Jan 20, 2018
be22689
criu: fix leaks detected by coverity scan
Snorch Feb 1, 2018
91babe7
test: make zdtm.py python2/python3 compatible
avagin Jun 1, 2018
2df652d
crtools: image-{cache, proxy} requires address/port
rst0git Feb 16, 2018
62c6539
criu: fix gcc-8 warnings
avagin Feb 4, 2018
f2054ba
remote: don't read from pointer after free
avagin Jul 12, 2018
d170cca
img-proxy: Remove duplicated include
rst0git Aug 22, 2018
383da03
remote: Merge check_pending_{reads,forwards}
rst0git Aug 22, 2018
69ed736
remote: Replace PATHLEN with PATH_MAX
rst0git Aug 30, 2018
68d4924
remote: Refactor TCP server setup
rst0git Sep 13, 2018
a713c2c
remote: Refactor TCP client setup
rst0git Sep 13, 2018
b99a274
remote: pull_snapshot_ids: Simplify if condition
rst0git Sep 13, 2018
3b9babc
remote: Use tmp file buffer when restore ip dump
rst0git Sep 13, 2018
ae5a850
python: Replace xrange with range
rst0git Sep 23, 2018
2fffe9c
image: fix typo in debug message
Snorch Sep 28, 2018
85f1a3e
py: Reformat everything into pep8 style
xemul Jan 24, 2020
0dbf262
Fix typos
rst0git Aug 22, 2018
88c337e
remote: Fix code indentation
rst0git Jan 29, 2019
96a823e
img-cache: Drop unnecessary accept_proxy_to_cache
rst0git Jan 29, 2019
66f2f31
img-cache/proxy: Close sockets on failure
rst0git Jan 29, 2019
d2c44c3
remote: Drop unused PB_LOCAL_IMAGE_SIZE
rst0git Jan 30, 2019
a539277
remote: Introduce strflags() macro
rst0git Feb 8, 2019
7223ac7
remote: Fix stringop-truncation warning
rst0git Feb 8, 2019
0a58954
remote: Fix 'flags' maybe uninitialized warning
rst0git Feb 8, 2019
3058b3f
remote: Make private functions static
rst0git Feb 8, 2019
d2d254c
remote: Use xmalloc/xzalloc/xfree
rst0git Feb 9, 2019
7f63b26
remote: Ignore interupt signals
rst0git Feb 11, 2019
f428d30
util: Don't pass address/port as arguments
rst0git Feb 13, 2019
a37a02d
remote: Rename 'proxy_to_cache_fd' to 'remote_sk'
rst0git Feb 24, 2019
c64f657
remote: Rename 'local_req_fd' to 'local_sk'
rst0git Feb 24, 2019
75dead1
util: Fix addr casting for IPv4/IPv6 in autobind
rst0git Feb 22, 2019
2f665d8
util: Introduce fd_set_nonblocking()
rst0git Feb 24, 2019
047b127
remote: Use \0 as indicator for a "finish" msg
rst0git Feb 27, 2019
861510f
Sort includes in criu/img-*.c
rst0git Feb 13, 2019
48ff3f1
util: Remove deprecated print_data() routine
rst0git Mar 24, 2019
83cb0c0
criu-ns: Convert to python3 style print() syntax
rst0git Apr 7, 2019
3846d16
criu-ns: Print usage info when no args provided
rst0git Apr 7, 2019
50b1a49
criu-ns: Convert c_char_p strings to bytes object
rst0git Apr 7, 2019
38a9b23
Convert spaces to tabs
rst0git Apr 12, 2019
13d2868
net: fix coverity RESOURCE_LEAK
adrianreber May 15, 2019
fe9ad62
py: Manual fixlets of code formatting
rst0git Jul 1, 2019
a981ddf
files-reg: Drop clear_ghost_files() prototype
rst0git Sep 1, 2019
cf7e7fc
cr-dump: Remove redundant if-statement
rst0git Aug 13, 2019
024bb21
arch/x86: push correct eip on the stack before lretq
avagin Sep 10, 2019
266db50
compel/x86: Don't use pushq for a label
0x7f454c46 Sep 11, 2019
bdee0a7
scripts: Drop Fedora 28/rawhide fix
rst0git Sep 9, 2019
f3caa7f
Add new command line option: --cgroup-yard
mclapinski Aug 8, 2019
10fb1cf
test: implement test for new --cgroup-yard option
mclapinski Aug 14, 2019
cc1fcfa
travis: Install missing diffutils dependency
rst0git Sep 14, 2019
cf54e13
arch/x86: fpu_state->fpu_state_ia32.xsave hast to be 64-byte aligned
avagin Sep 14, 2019
463227b
Introduce flush_early_log_to_stderr destructor
rst0git Sep 15, 2019
8d2a56a
Convert pr_msg() error messages to pr_err()
rst0git Sep 15, 2019
3e03d51
test/cgroup_yard: always clean up a test cgroup yard
avagin Sep 15, 2019
78f70bd
zdtm/cgroup_yard: create a test cgroup yard from the post-start hook
avagin Sep 19, 2019
bd80be8
cgroup: fixup nits
Snorch Sep 21, 2019
7df16f9
pipe: print pipe_id as unsigned to generate an external pipe name
avagin Sep 24, 2019
1816886
unix: print inode numbers as unsigned int
avagin Sep 24, 2019
fdbaf4a
Cleanup do_full_int80()
nviennot Sep 30, 2019
36e1da9
restorer/inotify: Don't overflow PIE stack
0x7f454c46 Oct 4, 2019
e515ef0
Adding --pre-dump-mode option
dubeyabhishek Oct 3, 2019
1c673f3
Handling iov generation for non-PROT_READ regions
dubeyabhishek Oct 3, 2019
bb504a8
Skip adding PROT_READ to non-PROT_READ mappings
dubeyabhishek Oct 3, 2019
cce4019
Adding cnt_sub for stats manipulation
dubeyabhishek Oct 3, 2019
a39e7a9
read mode pre-dump implementation
dubeyabhishek Oct 3, 2019
0b56cdc
Refactor time accounting macros
dubeyabhishek Oct 3, 2019
55bcadb
zdtm: handle --pre-dump-mode in the rpc mode
avagin Oct 4, 2019
4b9bcba
lib/c: fix a compile time error
avagin Oct 4, 2019
31e47a5
criu: use atomic_add instead of atomic_sub
avagin Oct 5, 2019
141e697
image: avoid name conflicts in image files
avagin Oct 5, 2019
919f4e7
Guard against empty file lock status
nviennot Oct 1, 2019
40b5731
page-pipe: Resize up to PIPE_MAX_SIZE
rst0git Sep 28, 2019
48ae837
cgroup: fix cg_yard leak on error path in prepare_cgroup_sfd
Snorch Apr 30, 2019
196551b
image-desc: Remove CR_FD_FILE_LOCKS_PID
rst0git Sep 14, 2019
91a5cad
service: Use space on stack for msg buffer
rst0git Oct 8, 2019
ee96348
Couple of fixes to build and run libcriu tests
Sep 13, 2019
4c1350d
Enable libcriu testing in travis jobs
Sep 16, 2019
870eaa5
Add `criu` to PATH env variable in libcriu tests
Sep 23, 2019
99049e2
early-log: Print warnings only if the buffer is full
0x7f454c46 Sep 30, 2019
48c9672
Action scripts should be invoked with normal signal behavior
nviennot Oct 24, 2019
0d6e92a
Fix broken web-links
ligurio Nov 3, 2019
c28e3b8
travis: start to use aarch64 hardware
adrianreber Oct 29, 2019
2bb53e7
test/static:conntracks: Support nftables
Nov 1, 2019
a43ea01
test/java: Add FileRead Tests
nidhi1605 Oct 18, 2019
72d44f8
travis: Disallow failures on ia32
0x7f454c46 Nov 9, 2019
d125c2b
mount: remove useless check in populate_mnt_ns
Snorch Feb 7, 2019
53b22e4
ns: make rst_new_ns_id static
Snorch Feb 7, 2019
743cb26
ns/restore/image: do not read namespace images for non-namespaced case
Snorch Feb 7, 2019
74faa96
mount: rework mount tree build step on restore
Snorch Feb 7, 2019
8529a48
mount: make mnt_resort_siblings nonrecursive and reuse friendly
Snorch Jun 27, 2019
7cc9a72
Run java functional tests on travis
nidhi1605 Nov 5, 2019
7cdca4c
travis: fix copy paste error from previous commit
adrianreber Nov 4, 2019
e98fe21
travis: Do not run privileged containers in LXD
adrianreber Nov 4, 2019
f7c5bc8
Makefile hack for travis aarch64/armv8l
adrianreber Nov 4, 2019
6f1fb1b
travis: switch all arm related tests to real hardware
adrianreber Nov 4, 2019
524263e
travis: switch pcp64le and s390x to real hardware
adrianreber Nov 13, 2019
025f8d9
travis: remove group from .travis.yml
adrianreber Nov 13, 2019
05b078f
lib/ptrace: Allow PTRACE_PEEKDATA with errno != 0
0x7f454c46 Nov 9, 2019
c19c153
lib/ptrace: Be more elaborate about failures
0x7f454c46 Nov 9, 2019
038f3eb
compel/infect: Warn if close() failed on memfd
0x7f454c46 Nov 9, 2019
eda9a11
compel: Mark compat argument of __NR() as used
0x7f454c46 Nov 9, 2019
0020f2a
lib/infect: Check if compel succeed in executing munmap
0x7f454c46 Nov 9, 2019
0998ac6
cr-dump: Try to cure remote on err-pathes
0x7f454c46 Nov 9, 2019
341d781
cr-dump: Warn if unmapping local memfd failed
0x7f454c46 Nov 9, 2019
0a4d747
cr-restore: Warn if restorer can't be unmapped
0x7f454c46 Nov 9, 2019
281c9f3
parasite-syscall: Log if can't cure on failed infection
0x7f454c46 Nov 9, 2019
9e998ad
compel/infect: Detach but fail compel_resume_task()
0x7f454c46 Nov 9, 2019
674bd13
criu: Kill tasks even when the network is unlocked
0x7f454c46 Nov 9, 2019
bcbe0af
compel/criu: Add __must_check
0x7f454c46 Nov 9, 2019
715a105
Checkpoint only specified controllers
mclapinski Nov 6, 2019
078efae
travis: group lazy-pages options
rppt Nov 17, 2019
f5c8c9e
travis: exclude uns tests for lazy-pages on newer kernels
rppt Nov 17, 2019
4c1ff11
mount: Add error messages
rst0git Nov 3, 2019
1b31164
mount: Bind-mount root via userns_call
rst0git Nov 9, 2019
91884a1
restore: Create temp proc in /tmp
rst0git Nov 10, 2019
6f23010
man: Describe --root option requirements
rst0git Nov 3, 2019
49a0fb0
zdtm: Replace if->continue with if->elif->else
rst0git Nov 19, 2019
7b970be
zdtm: Set --root path to 0700 on restore
avagin Nov 19, 2019
e7baaf1
build: Remove SRCARCH
0x7f454c46 Nov 21, 2019
70a5b0c
build/nmk: Remove SRCARCH
0x7f454c46 Nov 21, 2019
da58a10
build/nmk: Provide proper SUBARCH
0x7f454c46 Nov 21, 2019
1f09aba
build: Use SUBARCH
0x7f454c46 Nov 21, 2019
37eb8bf
build/zdtm: Support cross-build
0x7f454c46 Nov 21, 2019
f577270
build/zdtm: Makefile hack for travis aarch64/armv8l
0x7f454c46 Nov 21, 2019
3e09b0b
build/zdtm: Use pkg-config to find includes/libs
0x7f454c46 Nov 21, 2019
c3e1157
travis: Add armv7-cross as cross-compile test
0x7f454c46 Nov 21, 2019
53018af
Documentation: Add a hint about docker build
0x7f454c46 Nov 21, 2019
455e8f4
zdtm/socket-tcp-fin-wait1: Use array index fro TEST_MSG
0x7f454c46 Nov 21, 2019
5d451ee
Add File-based Java Functional Tests
nidhi1605 Nov 7, 2019
4405944
travis: ignore fails of podman-test
avagin Nov 20, 2019
41bcada
kerndat: check whether the new mount API is supported of not
avagin Nov 20, 2019
cb1f602
util: introduce the mount_detached_fs helper
avagin Nov 25, 2019
08a86c7
mount: use new mount API to open the proc file system
avagin Nov 20, 2019
2a4fffb
net: use new mount API to open the sysfs file system
avagin Nov 25, 2019
e209cd6
cgroup: use new mount API to open the cgroup file system
avagin Nov 25, 2019
fd4d0e6
readme: github pull-requests is the preferred way to contribute
avagin Nov 26, 2019
f728391
restorer/inotify: reorder inotify cleanup after waiting helpers and z…
Snorch Nov 12, 2019
a1533cd
mount: Order call_helper_process calls
cyrillos Nov 29, 2019
5515496
unix: sysctl -- Preserve max_dgram_qlen value
cyrillos Nov 14, 2019
1e39d9b
zdtm: sysctl net.unix.max_dgram_qlen value preservation test
mihalicyn Nov 14, 2019
08766ef
x86/cpu: cleanup and improve xfeatures_mask check
Snorch Dec 16, 2019
51c1445
crit: fix python3 encoding issues
nviennot Dec 18, 2019
65cd7a6
scripts: alpine: Install py2 packages with pip
rst0git Dec 20, 2019
210166b
sockets: Remove duplicate variable assignment
rst0git Dec 12, 2019
5dc8827
socket: c/r support for SO_KEEPALIVE
rst0git Dec 13, 2019
c8e9637
zdtm: Add test for SO_KEEPALIVE
rst0git Dec 13, 2019
d5a1c54
Fix tests on Ubuntu
adrianreber Dec 20, 2019
ee96f50
style: Enforce kernel style -Wdeclaration-after-statement
nviennot Dec 21, 2019
09c918c
style: Enforce kernel style -Wstrict-prototypes
nviennot Dec 21, 2019
faf310c
net: add nftables c/r
mihalicyn Nov 11, 2019
ec1690d
zdtm: nft tables preservation test
mihalicyn Nov 11, 2019
6905c22
files: fix ghost file error path
nviennot Dec 18, 2019
e6946e2
python: Improve decoding of file flags
nviennot Dec 30, 2019
4470237
files: Remove O_CLOEXEC from file flags
nviennot Dec 30, 2019
74f8c75
files: Add FD_CLOEXEC test
nviennot Dec 30, 2019
de7690d
travis: switch alpine to python3
adrianreber Jan 9, 2020
0d75cd9
Add Socket-based Java Functional Tests
nidhi1605 Dec 8, 2019
32f4f8b
Switch open-j9 alpine tests to python3
nidhi1605 Jan 9, 2020
72925cc
ppc64le: remove register '1' from clobber list
adrianreber Jan 14, 2020
2121d21
image: core -- Reserve start_time field
valeriyvdovin Jan 10, 2020
7e7b647
travis: reduce the number of podman tests
adrianreber Jan 9, 2020
bde7bea
kerndat: detect if system support clone3() with set_tid
adrianreber Dec 15, 2019
e97bc57
Add assembler wrapper for clone3()
adrianreber Dec 16, 2019
2082c03
Use clone3() with set_tid to create processes
adrianreber Dec 16, 2019
c53ed92
s390x: remove stack pointer from clobber list
adrianreber Jan 15, 2020
0f0564a
s390x: use clone3() if possible
adrianreber Jan 16, 2020
b2d9412
arm: remove stack pointer from clobber list
adrianreber Jan 21, 2020
0d9209d
ppc64le: use clone3() if possible
adrianreber Jan 17, 2020
a369581
clone3: handle clone3() with CLONE_PARENT
adrianreber Jan 25, 2020
784919b
aarch64: use clone3() if possible
adrianreber Jan 19, 2020
8d108a9
arm: use clone3() if it exists
adrianreber Jan 22, 2020
f075c1d
travis: fix warning and errors from validation
adrianreber Feb 4, 2020
bdcf709
compel: add -ffreestanding to force gcc not to use builtin memcpy, me…
mihalicyn Jan 14, 2020
049cd5b
doc/Makefile: don't hide xmlto stderr
kolyshkin Jan 30, 2020
9d219e8
criu(8): some minor rewording
kolyshkin Jan 30, 2020
0011cbb
criu(8): fix for asciidoctor
kolyshkin Jan 30, 2020
af9157f
criu: fix build failure against gcc-10
Feb 2, 2020
c172688
test/vdso: check the code path when here is no API to map vDSO
avagin Feb 5, 2020
f32a4e4
vdso: use correct offsets to remap vdso and vvar mappings
avagin Feb 5, 2020
83e0882
typo: fix missing space in error message
nviennot Feb 5, 2020
c365f70
memfd: add file support
nviennot Dec 18, 2019
1386dbb
files: increase path buffer size in inherited_fd()
nviennot Dec 18, 2019
883d3e4
memfd: add --inherit-fd support
nviennot Dec 18, 2019
8c006c2
memfd: add memory mapping support
nviennot Dec 18, 2019
3eb95b5
memfd: add seals support
nviennot Dec 18, 2019
557b191
inhfd_test: add support for non-pair files
nviennot Feb 4, 2020
6cf5182
memfd: add tests
nviennot Dec 21, 2019
9049d7b
criu: Use strlcpy() instead of strncpy()
0x7f454c46 Jan 23, 2020
6875c9a
criu: Make use strlcpy() to copy into allocated strings
0x7f454c46 Feb 6, 2020
7491326
zdtm: Make test_{doc,author} weak variables
0x7f454c46 Jan 24, 2020
a3501c0
vdso: Add vdso_is_present() helper
0x7f454c46 Jan 21, 2020
fa292e4
vdso: Repair !CONFIG_VDSO
0x7f454c46 Jan 22, 2020
540ab31
vdso: Don't page-align vvar
0x7f454c46 Jan 22, 2020
7150497
zdtm: mntns_rw_ro_rw update error msg
rst0git Jan 18, 2020
43a7b34
Travis: fix podman test case
adrianreber Feb 8, 2020
b5e857b
test/zdtm/inhfd: update dump options one each iteration
avagin Feb 7, 2020
a6083ea
python: sort imports
avagin Feb 7, 2020
285e689
test/jenkins: remove empty line at the end of file
Snorch Feb 21, 2020
a5f6158
uffd: use userns_call() to execute ioctl(UFFDIO_API)
rppt Feb 26, 2020
832ab07
criu(8): Add documentation for --enable-fs
rst0git Feb 18, 2020
30b07fc
criu(8): Convert tabs to spaces
rst0git Feb 18, 2020
4c27b3d
seize: prepare for cgroupv2 freezer
adrianreber Feb 4, 2020
aac4116
seize: factor out opening and writing the freezer state
adrianreber Feb 4, 2020
6f19249
seize: support cgroup v2 freezer
adrianreber Feb 4, 2020
378337a
cgroup2: add minimal cgroup2 support
adrianreber Feb 5, 2020
0c4b856
fs: use __open_proc instead of open("/proc/...", ... )
avagin Mar 1, 2020
9be35de
memfd: don't corrupt a state of the dumped fd
avagin Feb 29, 2020
e333749
zdtm/inhfd: force python to read new data from a file
avagin Feb 29, 2020
52c5dd5
fown: Don't fail on dumping files opened with O_PATH
cyrillos Feb 7, 2020
a90e88d
zdtm: add a test for files opened with O_PATH
Snorch Feb 7, 2020
657268d
files: allow dumping opened symlinks
mihalicyn Feb 7, 2020
27807fb
zdtm: add a test on open symlink migration
Snorch Feb 7, 2020
84ad718
zdtm/fifo_loop: don't try to write more than pipe size
avagin Mar 5, 2020
8ca165e
criu: Remove compel.h includes
0x7f454c46 Mar 5, 2020
fb386c2
compel: Remove compel.h
0x7f454c46 Mar 5, 2020
e419f2e
travis: Add aarch64-cross test on amd64
0x7f454c46 Mar 5, 2020
037aaf9
travis: Use debian/buster as base for cross build tests
0x7f454c46 Mar 5, 2020
717de3e
crit-recode: skip (not try to parse) nftables raw image
mihalicyn Mar 10, 2020
e7c8ac1
travis: add ppc64-cross test on amd64
rppt Mar 5, 2020
e0fca8b
mailmap: update my email
avagin Mar 21, 2020
9433b7b
make: use cflags/ldflags for config.h detection mechanism
nviennot Mar 20, 2020
2334261
mem: dump shared memory file descriptors
avagin Mar 15, 2020
27c6039
mem/vma: set VMA_FILE_{PRIVATE,SHARED} if a vma file is borrowed
avagin Mar 19, 2020
941d31b
test/zdtmp: add a test to C/R shared memory file descriptors
avagin Mar 15, 2020
419ccc9
zdtm: Implemented get_current_dir_name wrapper that checks for 'x' pe…
valeriyvdovin Feb 3, 2020
f883e92
zdtm: Use safe helper function to initialize unix socket sockaddr str…
valeriyvdovin Feb 3, 2020
49cc6ce
pipe: restore pipe size even if a pipe is empty
avagin Mar 21, 2020
b00267e
test/pipe03: check that pipe size is restored
avagin Mar 21, 2020
d2b99a2
test/fifo_loop: change sizes of all fifo-s to fit a test buffer
avagin Mar 21, 2020
ff6c7d9
vz7: sockets: Separate socket buffer size setting into a helper
Apr 5, 2017
f42491e
sk-unix -- Restore qlen before pushing queued data back
Mar 14, 2018
c6d3f25
unix: image -- Move uflags into enum
Aug 29, 2018
1b85265
unix: Collect bindmounted unix sockets
cyrillos Jun 9, 2018
9d83f94
unix: Collect images before opening mountpoints
cyrillos Jun 9, 2018
b2b2bfb
unix: Collect bindmounted unix sockets into own list
cyrillos Jun 9, 2018
5dda301
unix: Move shared data init into early stage
cyrillos Jun 9, 2018
b2ee9fa
unix: Add support for bindmounted sockets
Aug 29, 2018
3ec1c5a
unix: test -- Add bind-mount-unix test case
Aug 29, 2018
6c9ee70
unix: bindmount -- Move mounting code to be called before first mount
Aug 29, 2018
271a6cb
zdtm: Add sstrncpy helper
cyrillos Jun 9, 2018
803ffb0
unix: bindmount -- Show details about queuer
Sep 5, 2018
6ee1ad6
unix: break_connected -- Add a log recod
Sep 5, 2018
32e74c2
unix: make_socket -- Add more detailed logs
Sep 5, 2018
7f93219
unix: make_socket -- Break connected pair if requested
Sep 5, 2018
2f9a89f
unix: bind_unix_sk -- Add ability to skip waiters notification
Sep 14, 2018
9581911
unix: unlink_sk -- Don't unlink bindmounted sockets
Sep 6, 2018
726f6b0
unix: unix_prepare_bindmount -- Allow to connect via relative name
Sep 6, 2018
95c2c84
test: bind-mount-unix -- Implement real connect
Sep 6, 2018
2aa32b3
unix: Don't forget to close ns descriptor on error path
Sep 27, 2018
bdc533e
unix: Disable switching mount namespace
Oct 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions criu/include/sockets.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

struct fdinfo_list_entry;
struct sk_opts_entry;
struct mount_info;
struct file_desc;
struct fd_parms;
struct cr_imgset;
Expand Down Expand Up @@ -44,6 +45,7 @@ extern int fix_external_unix_sockets(void);
extern int prepare_scms(void);
extern int unix_note_scm_rights(int id_for, uint32_t *file_ids, int *fds, int n_ids);
extern int collect_unix_bindmounts(void);
extern int unix_prepare_bindmount(struct mount_info *mi);

extern struct collect_image_info netlink_sk_cinfo;

Expand Down
8 changes: 8 additions & 0 deletions criu/mount.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "clone-noasan.h"
#include "fdstore.h"

#include "sockets.h"
#include "images/mnt.pb-c.h"

/*
Expand Down Expand Up @@ -2615,6 +2616,13 @@ static int try_remap_mount(struct mount_info *m)
struct mnt_remap_entry *r;

if (!mnt_needs_remap(m))

if (unix_prepare_bindmount(mi)) {
pr_err("Failed to prepare bindmount on unix at %s\n",
mi->mountpoint);
goto err;
}

return 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hunk is supper strange, please fix it =) You better merge "unix: bindmount -- Move mounting code to be called before first mount" to this commit.


BUG_ON(!m->parent);
Expand Down
Loading