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
17e5707e
Unverified
Commit
17e5707e
authored
Jun 26, 2018
by
2xsec
Committed by
Christian Brauner
Jun 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
log: remove strerror() from SYSERROR call
Signed-off-by:
2xsec
<
dh48.jeong@samsung.com
>
parent
23253ca0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
lxc_monitord.c
src/lxc/cmd/lxc_monitord.c
+1
-1
lsm.c
src/lxc/lsm/lsm.c
+1
-2
monitor.c
src/lxc/monitor.c
+1
-1
overlay.c
src/lxc/storage/overlay.c
+2
-3
No files found.
src/lxc/cmd/lxc_monitord.c
View file @
17e5707e
...
@@ -300,7 +300,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
...
@@ -300,7 +300,7 @@ static int lxc_monitord_fifo_handler(int fd, uint32_t events, void *data,
ret
=
read
(
fd
,
&
msglxc
,
sizeof
(
msglxc
));
ret
=
read
(
fd
,
&
msglxc
,
sizeof
(
msglxc
));
if
(
ret
!=
sizeof
(
msglxc
))
{
if
(
ret
!=
sizeof
(
msglxc
))
{
SYSERROR
(
"Reading from fifo failed
: %s."
,
strerror
(
errno
)
);
SYSERROR
(
"Reading from fifo failed
"
);
return
LXC_MAINLOOP_CLOSE
;
return
LXC_MAINLOOP_CLOSE
;
}
}
...
...
src/lxc/lsm/lsm.c
View file @
17e5707e
...
@@ -112,8 +112,7 @@ int lsm_process_label_fd_get(pid_t pid, bool on_exec)
...
@@ -112,8 +112,7 @@ int lsm_process_label_fd_get(pid_t pid, bool on_exec)
labelfd
=
open
(
path
,
O_RDWR
);
labelfd
=
open
(
path
,
O_RDWR
);
if
(
labelfd
<
0
)
{
if
(
labelfd
<
0
)
{
SYSERROR
(
"%s - Unable to %s LSM label file descriptor"
,
SYSERROR
(
"Unable to %s LSM label file descriptor"
,
name
);
name
,
strerror
(
errno
));
return
-
1
;
return
-
1
;
}
}
...
...
src/lxc/monitor.c
View file @
17e5707e
...
@@ -261,7 +261,7 @@ int lxc_monitor_read_fdset(struct pollfd *fds, nfds_t nfds, struct lxc_msg *msg,
...
@@ -261,7 +261,7 @@ int lxc_monitor_read_fdset(struct pollfd *fds, nfds_t nfds, struct lxc_msg *msg,
fds
[
i
].
revents
=
0
;
fds
[
i
].
revents
=
0
;
ret
=
recv
(
fds
[
i
].
fd
,
msg
,
sizeof
(
*
msg
),
0
);
ret
=
recv
(
fds
[
i
].
fd
,
msg
,
sizeof
(
*
msg
),
0
);
if
(
ret
<=
0
)
{
if
(
ret
<=
0
)
{
SYSERROR
(
"Failed to receive message. Did monitord die?
: %s."
,
strerror
(
errno
)
);
SYSERROR
(
"Failed to receive message. Did monitord die?
"
);
return
-
1
;
return
-
1
;
}
}
return
ret
;
return
ret
;
...
...
src/lxc/storage/overlay.c
View file @
17e5707e
...
@@ -645,9 +645,8 @@ int ovl_mount(struct lxc_storage *bdev)
...
@@ -645,9 +645,8 @@ int ovl_mount(struct lxc_storage *bdev)
ret
=
ovl_remount_on_enodev
(
lower
,
bdev
->
dest
,
ovl_name
,
ret
=
ovl_remount_on_enodev
(
lower
,
bdev
->
dest
,
ovl_name
,
MS_MGC_VAL
|
mntflags
,
options
);
MS_MGC_VAL
|
mntflags
,
options
);
if
(
ret
<
0
)
if
(
ret
<
0
)
SYSERROR
(
"Failed to mount
\"
%s
\"
on
\"
%s
\"
with "
SYSERROR
(
"Failed to mount
\"
%s
\"
on
\"
%s
\"
with options
\"
%s
\"
"
,
"options
\"
%s
\"
: %s"
,
lower
,
bdev
->
dest
,
options
);
lower
,
bdev
->
dest
,
options
,
strerror
(
errno
));
else
else
INFO
(
"Mounted
\"
%s
\"
on
\"
%s
\"
with options
\"
%s
\"
"
,
INFO
(
"Mounted
\"
%s
\"
on
\"
%s
\"
with options
\"
%s
\"
"
,
lower
,
bdev
->
dest
,
options
);
lower
,
bdev
->
dest
,
options
);
...
...
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