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
87d0d61e
Commit
87d0d61e
authored
Mar 27, 2013
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lock: Show long option in log message about using one
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
25ef4199
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
cr-dump.c
cr-dump.c
+1
-1
crtools.c
crtools.c
+3
-2
file-lock.h
include/file-lock.h
+2
-0
No files found.
cr-dump.c
View file @
87d0d61e
...
@@ -1087,7 +1087,7 @@ static int collect_file_locks(const struct cr_options *opts)
...
@@ -1087,7 +1087,7 @@ static int collect_file_locks(const struct cr_options *opts)
*/
*/
if
(
!
list_empty
(
&
file_lock_list
))
{
if
(
!
list_empty
(
&
file_lock_list
))
{
pr_err
(
"Some file locks are hold by dumping tasks!"
pr_err
(
"Some file locks are hold by dumping tasks!"
"You can try -
l
to dump them.
\n
"
);
"You can try -
-"
OPT_FILE_LOCKS
"
to dump them.
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
crtools.c
View file @
87d0d61e
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
#include "version.h"
#include "version.h"
#include "page-xfer.h"
#include "page-xfer.h"
#include "tty.h"
#include "tty.h"
#include "file-lock.h"
struct
cr_options
opts
;
struct
cr_options
opts
;
...
@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
...
@@ -107,7 +108,7 @@ int main(int argc, char *argv[])
{
"action-script"
,
required_argument
,
0
,
49
},
{
"action-script"
,
required_argument
,
0
,
49
},
{
LREMAP_PARAM
,
no_argument
,
0
,
41
},
{
LREMAP_PARAM
,
no_argument
,
0
,
41
},
{
OPT_SHELL_JOB
,
no_argument
,
0
,
'j'
},
{
OPT_SHELL_JOB
,
no_argument
,
0
,
'j'
},
{
"file-locks"
,
no_argument
,
0
,
'l'
},
{
OPT_FILE_LOCKS
,
no_argument
,
0
,
'l'
},
{
"page-server"
,
no_argument
,
0
,
50
},
{
"page-server"
,
no_argument
,
0
,
50
},
{
"address"
,
required_argument
,
0
,
51
},
{
"address"
,
required_argument
,
0
,
51
},
{
"port"
,
required_argument
,
0
,
52
},
{
"port"
,
required_argument
,
0
,
52
},
...
@@ -363,7 +364,7 @@ usage:
...
@@ -363,7 +364,7 @@ usage:
pr_msg
(
" * network-lock - lock network in a target network namespace
\n
"
);
pr_msg
(
" * network-lock - lock network in a target network namespace
\n
"
);
pr_msg
(
" * network-unlock - unlock network in a target network namespace
\n
"
);
pr_msg
(
" * network-unlock - unlock network in a target network namespace
\n
"
);
pr_msg
(
" -j|--%s allow to dump and restore shell jobs
\n
"
,
OPT_SHELL_JOB
);
pr_msg
(
" -j|--%s allow to dump and restore shell jobs
\n
"
,
OPT_SHELL_JOB
);
pr_msg
(
" -l|--
file-locks handle file locks, for safety, only used for container
\n
"
);
pr_msg
(
" -l|--
%s handle file locks, for safety, only used for container
\n
"
,
OPT_FILE_LOCKS
);
pr_msg
(
"
\n
* Logging:
\n
"
);
pr_msg
(
"
\n
* Logging:
\n
"
);
pr_msg
(
" -o|--log-file [NAME] log file name (relative path is relative to --images-dir)
\n
"
);
pr_msg
(
" -o|--log-file [NAME] log file name (relative path is relative to --images-dir)
\n
"
);
...
...
include/file-lock.h
View file @
87d0d61e
...
@@ -53,4 +53,6 @@ extern int dump_task_file_locks(struct parasite_ctl *ctl,
...
@@ -53,4 +53,6 @@ extern int dump_task_file_locks(struct parasite_ctl *ctl,
extern
int
prepare_file_locks
(
int
pid
);
extern
int
prepare_file_locks
(
int
pid
);
#define OPT_FILE_LOCKS "file-locks"
#endif
/* __FILE_LOCK_H__ */
#endif
/* __FILE_LOCK_H__ */
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