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
1514284d
Commit
1514284d
authored
Aug 20, 2014
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
locks: Fix restore from v1.2 images
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
c049d845
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
file-lock.c
file-lock.c
+1
-1
image-desc.c
image-desc.c
+1
-1
No files found.
file-lock.c
View file @
1514284d
...
@@ -265,7 +265,7 @@ static int restore_file_locks_legacy(int pid)
...
@@ -265,7 +265,7 @@ static int restore_file_locks_legacy(int pid)
int
fd
,
ret
=
-
1
;
int
fd
,
ret
=
-
1
;
FileLockEntry
*
fle
;
FileLockEntry
*
fle
;
fd
=
open_image
(
CR_FD_FILE_LOCKS
,
O_RSTR
|
O_OPT
,
pid
);
fd
=
open_image
(
CR_FD_FILE_LOCKS
_PID
,
O_RSTR
|
O_OPT
,
pid
);
if
(
fd
<
0
)
{
if
(
fd
<
0
)
{
if
(
fd
==
-
ENOENT
)
if
(
fd
==
-
ENOENT
)
return
0
;
return
0
;
...
...
image-desc.c
View file @
1514284d
...
@@ -91,7 +91,7 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
...
@@ -91,7 +91,7 @@ struct cr_fd_desc_tmpl fdset_template[CR_FD_MAX] = {
},
},
[
CR_FD_FILE_LOCKS_PID
]
=
{
[
CR_FD_FILE_LOCKS_PID
]
=
{
.
fmt
=
"filelocks-%d"
,
.
fmt
=
"filelocks-%d
.img
"
,
.
magic
=
FILE_LOCKS_MAGIC
,
.
magic
=
FILE_LOCKS_MAGIC
,
},
},
};
};
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