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
dab02267
Unverified
Commit
dab02267
authored
Jan 27, 2021
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
attach: make do_attach() void
Cc: stable-4.0 Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
737a8d85
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
attach.c
src/lxc/attach.c
+3
-6
No files found.
src/lxc/attach.c
View file @
dab02267
...
@@ -644,7 +644,7 @@ static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
...
@@ -644,7 +644,7 @@ static void lxc_put_attach_clone_payload(struct attach_clone_payload *p)
}
}
}
}
__noreturn
static
int
do_attach
(
struct
attach_clone_payload
*
payload
)
__noreturn
static
void
do_attach
(
struct
attach_clone_payload
*
payload
)
{
{
int
lsm_fd
,
ret
;
int
lsm_fd
,
ret
;
uid_t
new_uid
;
uid_t
new_uid
;
...
@@ -892,6 +892,7 @@ __noreturn static int do_attach(struct attach_clone_payload *payload)
...
@@ -892,6 +892,7 @@ __noreturn static int do_attach(struct attach_clone_payload *payload)
on_error:
on_error:
lxc_put_attach_clone_payload
(
payload
);
lxc_put_attach_clone_payload
(
payload
);
ERROR
(
"Failed to attach to container"
);
_exit
(
EXIT_FAILURE
);
_exit
(
EXIT_FAILURE
);
}
}
...
@@ -1223,11 +1224,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
...
@@ -1223,11 +1224,7 @@ int lxc_attach(struct lxc_container *container, lxc_attach_exec_t exec_function,
}
}
}
}
ret
=
do_attach
(
&
payload
);
do_attach
(
&
payload
);
if
(
ret
<
0
)
ERROR
(
"Failed to exec"
);
_exit
(
EXIT_FAILURE
);
}
}
if
(
options
->
attach_flags
&
LXC_ATTACH_TERMINAL
)
if
(
options
->
attach_flags
&
LXC_ATTACH_TERMINAL
)
...
...
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