Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
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
zhul
criu
Commits
91011328
Commit
91011328
authored
Jan 14, 2014
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
criu: Several formatting fixes
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
d9ec409b
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
9 deletions
+10
-9
cr-dedup.c
cr-dedup.c
+2
-2
cr-dump.c
cr-dump.c
+1
-1
cr-exec.c
cr-exec.c
+1
-1
cr-show.c
cr-show.c
+1
-1
image.c
image.c
+1
-1
list.h
include/list.h
+1
-1
mount.c
mount.c
+1
-1
page-xfer.c
page-xfer.c
+1
-0
parasite.c
pie/parasite.c
+1
-1
No files found.
cr-dedup.c
View file @
91011328
...
@@ -115,8 +115,8 @@ int dedup_one_iovec(struct page_read *pr, struct iovec *iov)
...
@@ -115,8 +115,8 @@ int dedup_one_iovec(struct page_read *pr, struct iovec *iov)
unsigned
long
piov_end
;
unsigned
long
piov_end
;
ret
=
seek_pagemap_page
(
pr
,
off
,
false
);
ret
=
seek_pagemap_page
(
pr
,
off
,
false
);
if
(
ret
==
-
1
)
{
if
(
ret
==
-
1
)
{
if
(
off
<
pr
->
cvaddr
)
{
if
(
off
<
pr
->
cvaddr
)
{
if
(
pr
->
cvaddr
<
iov_end
)
if
(
pr
->
cvaddr
<
iov_end
)
off
=
pr
->
cvaddr
;
off
=
pr
->
cvaddr
;
else
else
return
0
;
return
0
;
...
...
cr-dump.c
View file @
91011328
...
@@ -1417,7 +1417,7 @@ static int dump_one_task(struct pstree_item *item)
...
@@ -1417,7 +1417,7 @@ static int dump_one_task(struct pstree_item *item)
}
}
ret
=
parse_posix_timers
(
pid
,
&
proc_args
);
ret
=
parse_posix_timers
(
pid
,
&
proc_args
);
if
(
ret
<
0
){
if
(
ret
<
0
)
{
pr_err
(
"Can't read posix timers file (pid: %d)
\n
"
,
pid
);
pr_err
(
"Can't read posix timers file (pid: %d)
\n
"
,
pid
);
goto
err
;
goto
err
;
}
}
...
...
cr-exec.c
View file @
91011328
...
@@ -49,7 +49,7 @@ static int execute_syscall(struct parasite_ctl *ctl,
...
@@ -49,7 +49,7 @@ static int execute_syscall(struct parasite_ctl *ctl,
* @<size> -- ret-arg of size <size>
* @<size> -- ret-arg of size <size>
*/
*/
if
((
opt
[
i
][
0
]
==
'&'
)
||
(
opt
[
i
][
0
]
==
'@'
)){
if
((
opt
[
i
][
0
]
==
'&'
)
||
(
opt
[
i
][
0
]
==
'@'
))
{
int
len
;
int
len
;
if
(
!
r_mem
)
{
if
(
!
r_mem
)
{
...
...
cr-show.c
View file @
91011328
...
@@ -478,7 +478,7 @@ static int cr_show_pid(int pid)
...
@@ -478,7 +478,7 @@ static int cr_show_pid(int pid)
PstreeEntry
*
pe
;
PstreeEntry
*
pe
;
ret
=
pb_read_one_eof
(
fd
,
&
pe
,
PB_PSTREE
);
ret
=
pb_read_one_eof
(
fd
,
&
pe
,
PB_PSTREE
);
if
(
ret
<=
0
){
if
(
ret
<=
0
)
{
close
(
fd
);
close
(
fd
);
return
ret
;
return
ret
;
}
}
...
...
image.c
View file @
91011328
...
@@ -71,7 +71,7 @@ int write_img_inventory(void)
...
@@ -71,7 +71,7 @@ int write_img_inventory(void)
crt
.
state
=
TASK_ALIVE
;
crt
.
state
=
TASK_ALIVE
;
crt
.
pid
.
real
=
getpid
();
crt
.
pid
.
real
=
getpid
();
if
(
get_task_ids
(
&
crt
)){
if
(
get_task_ids
(
&
crt
))
{
close
(
fd
);
close
(
fd
);
return
-
1
;
return
-
1
;
}
}
...
...
include/list.h
View file @
91011328
...
@@ -366,7 +366,7 @@ static inline void hlist_add_after(struct hlist_node *n,
...
@@ -366,7 +366,7 @@ static inline void hlist_add_after(struct hlist_node *n,
n
->
next
=
next
;
n
->
next
=
next
;
next
->
pprev
=
&
n
->
next
;
next
->
pprev
=
&
n
->
next
;
if
(
next
->
next
)
if
(
next
->
next
)
next
->
next
->
pprev
=
&
next
->
next
;
next
->
next
->
pprev
=
&
next
->
next
;
}
}
...
...
mount.c
View file @
91011328
...
@@ -1507,7 +1507,7 @@ int mntns_collect_root(pid_t pid)
...
@@ -1507,7 +1507,7 @@ int mntns_collect_root(pid_t pid)
pfd
=
open_pid_proc
(
pid
);
pfd
=
open_pid_proc
(
pid
);
ret
=
readlinkat
(
pfd
,
"root"
,
path
,
sizeof
(
path
)
-
1
);
ret
=
readlinkat
(
pfd
,
"root"
,
path
,
sizeof
(
path
)
-
1
);
if
(
ret
<
0
){
if
(
ret
<
0
)
{
close_pid_proc
();
close_pid_proc
();
return
ret
;
return
ret
;
}
}
...
...
page-xfer.c
View file @
91011328
...
@@ -560,6 +560,7 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, long id)
...
@@ -560,6 +560,7 @@ static int open_page_local_xfer(struct page_xfer *xfer, int fd_type, long id)
if
(
opts
.
auto_dedup
&&
!
opts
.
use_page_server
)
{
if
(
opts
.
auto_dedup
&&
!
opts
.
use_page_server
)
{
int
ret
;
int
ret
;
int
pfd
;
int
pfd
;
pfd
=
openat
(
get_service_fd
(
IMG_FD_OFF
),
CR_PARENT_LINK
,
O_RDONLY
);
pfd
=
openat
(
get_service_fd
(
IMG_FD_OFF
),
CR_PARENT_LINK
,
O_RDONLY
);
if
(
pfd
<
0
&&
errno
==
ENOENT
)
if
(
pfd
<
0
&&
errno
==
ENOENT
)
goto
out
;
goto
out
;
...
...
pie/parasite.c
View file @
91011328
...
@@ -121,7 +121,7 @@ static int dump_posix_timers(struct parasite_dump_posix_timers_args *args)
...
@@ -121,7 +121,7 @@ static int dump_posix_timers(struct parasite_dump_posix_timers_args *args)
int
i
;
int
i
;
int
ret
=
0
;
int
ret
=
0
;
for
(
i
=
0
;
i
<
args
->
timer_n
;
i
++
){
for
(
i
=
0
;
i
<
args
->
timer_n
;
i
++
)
{
ret
=
sys_timer_gettime
(
args
->
timer
[
i
].
it_id
,
&
args
->
timer
[
i
].
val
);
ret
=
sys_timer_gettime
(
args
->
timer
[
i
].
it_id
,
&
args
->
timer
[
i
].
val
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
pr_err
(
"sys_timer_gettime failed (%d)
\n
"
,
ret
);
pr_err
(
"sys_timer_gettime failed (%d)
\n
"
,
ret
);
...
...
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