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
95bc087f
Unverified
Commit
95bc087f
authored
Jul 29, 2018
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
criu: s/read()/lxc_read_nointr()/g
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
d2bd14f0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
criu.c
src/lxc/criu.c
+3
-3
No files found.
src/lxc/criu.c
View file @
95bc087f
...
@@ -983,7 +983,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
...
@@ -983,7 +983,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_
if
(
WEXITSTATUS
(
status
))
{
if
(
WEXITSTATUS
(
status
))
{
int
n
;
int
n
;
n
=
read
(
pipes
[
0
],
buf
,
sizeof
(
buf
));
n
=
lxc_read_nointr
(
pipes
[
0
],
buf
,
sizeof
(
buf
));
if
(
n
<
0
)
{
if
(
n
<
0
)
{
SYSERROR
(
"failed reading from criu stderr"
);
SYSERROR
(
"failed reading from criu stderr"
);
goto
out_fini_handler
;
goto
out_fini_handler
;
...
@@ -1206,7 +1206,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op
...
@@ -1206,7 +1206,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op
return
false
;
return
false
;
}
}
n
=
read
(
criuout
[
0
],
buf
,
sizeof
(
buf
));
n
=
lxc_read_nointr
(
criuout
[
0
],
buf
,
sizeof
(
buf
));
close
(
criuout
[
0
]);
close
(
criuout
[
0
]);
if
(
n
<
0
)
{
if
(
n
<
0
)
{
SYSERROR
(
"read"
);
SYSERROR
(
"read"
);
...
@@ -1309,7 +1309,7 @@ bool __criu_restore(struct lxc_container *c, struct migrate_opts *opts)
...
@@ -1309,7 +1309,7 @@ bool __criu_restore(struct lxc_container *c, struct migrate_opts *opts)
close
(
pipefd
[
1
]);
close
(
pipefd
[
1
]);
free
(
criu_version
);
free
(
criu_version
);
nread
=
read
(
pipefd
[
0
],
&
status
,
sizeof
(
status
));
nread
=
lxc_read_nointr
(
pipefd
[
0
],
&
status
,
sizeof
(
status
));
close
(
pipefd
[
0
]);
close
(
pipefd
[
0
]);
if
(
sizeof
(
status
)
!=
nread
)
{
if
(
sizeof
(
status
)
!=
nread
)
{
ERROR
(
"reading status from pipe failed"
);
ERROR
(
"reading status from pipe failed"
);
...
...
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