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
92cce8ee
Unverified
Commit
92cce8ee
authored
Aug 10, 2018
by
2xsec
Committed by
Christian Brauner
Aug 12, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix assignment of signed to bigger unsigned issue
Signed-off-by:
2xsec
<
dh48.jeong@samsung.com
>
parent
14c1904b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
80 additions
and
37 deletions
+80
-37
conf.c
src/lxc/conf.c
+4
-3
criu.c
src/lxc/criu.c
+1
-1
btrfs.c
src/lxc/storage/btrfs.c
+74
-32
btrfs.h
src/lxc/storage/btrfs.h
+1
-1
No files found.
src/lxc/conf.c
View file @
92cce8ee
...
@@ -963,7 +963,8 @@ static int lxc_setup_ttys(struct lxc_conf *conf)
...
@@ -963,7 +963,8 @@ static int lxc_setup_ttys(struct lxc_conf *conf)
int
lxc_allocate_ttys
(
struct
lxc_conf
*
conf
)
int
lxc_allocate_ttys
(
struct
lxc_conf
*
conf
)
{
{
int
i
,
ret
;
size_t
i
;
int
ret
;
struct
lxc_tty_info
*
ttys
=
&
conf
->
ttys
;
struct
lxc_tty_info
*
ttys
=
&
conf
->
ttys
;
/* no tty in the configuration */
/* no tty in the configuration */
...
@@ -981,7 +982,7 @@ int lxc_allocate_ttys(struct lxc_conf *conf)
...
@@ -981,7 +982,7 @@ int lxc_allocate_ttys(struct lxc_conf *conf)
tty
->
slave
=
-
EBADF
;
tty
->
slave
=
-
EBADF
;
ret
=
openpty
(
&
tty
->
master
,
&
tty
->
slave
,
NULL
,
NULL
,
NULL
);
ret
=
openpty
(
&
tty
->
master
,
&
tty
->
slave
,
NULL
,
NULL
,
NULL
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
SYSERROR
(
"Failed to create tty %
d
"
,
i
);
SYSERROR
(
"Failed to create tty %
zu
"
,
i
);
ttys
->
max
=
i
;
ttys
->
max
=
i
;
lxc_delete_tty
(
ttys
);
lxc_delete_tty
(
ttys
);
return
-
ENOTTY
;
return
-
ENOTTY
;
...
@@ -989,7 +990,7 @@ int lxc_allocate_ttys(struct lxc_conf *conf)
...
@@ -989,7 +990,7 @@ int lxc_allocate_ttys(struct lxc_conf *conf)
ret
=
ttyname_r
(
tty
->
slave
,
tty
->
name
,
sizeof
(
tty
->
name
));
ret
=
ttyname_r
(
tty
->
slave
,
tty
->
name
,
sizeof
(
tty
->
name
));
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
SYSERROR
(
"Failed to retrieve name of tty %
d
slave"
,
i
);
SYSERROR
(
"Failed to retrieve name of tty %
zu
slave"
,
i
);
ttys
->
max
=
i
;
ttys
->
max
=
i
;
lxc_delete_tty
(
ttys
);
lxc_delete_tty
(
ttys
);
return
-
ENOTTY
;
return
-
ENOTTY
;
...
...
src/lxc/criu.c
View file @
92cce8ee
...
@@ -677,7 +677,7 @@ bool __criu_check_feature(uint64_t *features_to_check)
...
@@ -677,7 +677,7 @@ bool __criu_check_feature(uint64_t *features_to_check)
pid_t
pid
;
pid_t
pid
;
uint64_t
current_bit
=
0
;
uint64_t
current_bit
=
0
;
int
ret
;
int
ret
;
in
t
features
=
*
features_to_check
;
uint64_
t
features
=
*
features_to_check
;
/* Feature checking is currently always like
/* Feature checking is currently always like
* criu check --feature <feature-name>
* criu check --feature <feature-name>
*/
*/
...
...
src/lxc/storage/btrfs.c
View file @
92cce8ee
This diff is collapsed.
Click to expand it.
src/lxc/storage/btrfs.h
View file @
92cce8ee
...
@@ -396,7 +396,7 @@ extern int btrfs_mount(struct lxc_storage *bdev);
...
@@ -396,7 +396,7 @@ extern int btrfs_mount(struct lxc_storage *bdev);
extern
int
btrfs_umount
(
struct
lxc_storage
*
bdev
);
extern
int
btrfs_umount
(
struct
lxc_storage
*
bdev
);
extern
char
*
get_btrfs_subvol_path
(
int
fd
,
u64
dir_id
,
u64
objid
,
char
*
name
,
extern
char
*
get_btrfs_subvol_path
(
int
fd
,
u64
dir_id
,
u64
objid
,
char
*
name
,
int
name_len
);
u16
name_len
);
extern
int
btrfs_list_get_path_rootid
(
int
fd
,
u64
*
treeid
);
extern
int
btrfs_list_get_path_rootid
(
int
fd
,
u64
*
treeid
);
extern
bool
is_btrfs_fs
(
const
char
*
path
);
extern
bool
is_btrfs_fs
(
const
char
*
path
);
extern
int
is_btrfs_subvol
(
const
char
*
path
);
extern
int
is_btrfs_subvol
(
const
char
*
path
);
...
...
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