Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
95ef0d7c
Unverified
Commit
95ef0d7c
authored
Aug 22, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start: add out_sync_fini cleanup label
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
9b5724cd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
16 deletions
+10
-16
start.c
src/lxc/start.c
+10
-16
No files found.
src/lxc/start.c
View file @
95ef0d7c
...
@@ -1651,28 +1651,21 @@ static int lxc_spawn(struct lxc_handler *handler)
...
@@ -1651,28 +1651,21 @@ static int lxc_spawn(struct lxc_handler *handler)
ret
=
socketpair
(
AF_UNIX
,
SOCK_STREAM
|
SOCK_CLOEXEC
,
0
,
ret
=
socketpair
(
AF_UNIX
,
SOCK_STREAM
|
SOCK_CLOEXEC
,
0
,
handler
->
data_sock
);
handler
->
data_sock
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
lxc_sync_fini
(
handler
);
goto
out_sync_fini
;
return
-
1
;
}
ret
=
resolve_clone_flags
(
handler
);
ret
=
resolve_clone_flags
(
handler
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
lxc_sync_fini
(
handler
);
goto
out_sync_fini
;
return
-
1
;
}
if
(
conf
->
shmount
.
path_host
)
{
if
(
conf
->
shmount
.
path_host
)
{
if
(
!
conf
->
shmount
.
path_cont
)
{
if
(
!
conf
->
shmount
.
path_cont
)
lxc_sync_fini
(
handler
);
goto
out_sync_fini
;
return
-
1
;
}
ret
=
lxc_setup_shmount
(
conf
);
ret
=
lxc_setup_shmount
(
conf
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
ERROR
(
"Failed to setup shared mount point"
);
ERROR
(
"Failed to setup shared mount point"
);
lxc_sync_fini
(
handler
);
goto
out_sync_fini
;
return
-
1
;
}
}
}
}
...
@@ -1687,8 +1680,7 @@ static int lxc_spawn(struct lxc_handler *handler)
...
@@ -1687,8 +1680,7 @@ static int lxc_spawn(struct lxc_handler *handler)
ret
=
lxc_find_gateway_addresses
(
handler
);
ret
=
lxc_find_gateway_addresses
(
handler
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
ERROR
(
"Failed to find gateway addresses"
);
ERROR
(
"Failed to find gateway addresses"
);
lxc_sync_fini
(
handler
);
goto
out_sync_fini
;
return
-
1
;
}
}
/* That should be done before the clone because we will
/* That should be done before the clone because we will
...
@@ -1963,6 +1955,8 @@ out_delete_net:
...
@@ -1963,6 +1955,8 @@ out_delete_net:
out_abort:
out_abort:
lxc_abort
(
name
,
handler
);
lxc_abort
(
name
,
handler
);
out_sync_fini:
lxc_sync_fini
(
handler
);
lxc_sync_fini
(
handler
);
if
(
handler
->
pinfd
>=
0
)
{
if
(
handler
->
pinfd
>=
0
)
{
close
(
handler
->
pinfd
);
close
(
handler
->
pinfd
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment