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
8cc69880
Unverified
Commit
8cc69880
authored
Aug 15, 2017
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "storage: add arg to create_snapshot()"
This reverts commit
a3e85dae
. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
c5365519
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
bdev.c
src/lxc/bdev/bdev.c
+1
-1
bdev.h
src/lxc/bdev/bdev.h
+1
-1
lxcbtrfs.c
src/lxc/bdev/lxcbtrfs.c
+1
-1
lxcbtrfs.h
src/lxc/bdev/lxcbtrfs.h
+1
-1
No files found.
src/lxc/bdev/bdev.c
View file @
8cc69880
...
@@ -436,7 +436,7 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
...
@@ -436,7 +436,7 @@ struct bdev *bdev_copy(struct lxc_container *c0, const char *cname,
if
(
!
strcmp
(
orig
->
type
,
"btrfs"
)
&&
!
strcmp
(
new
->
type
,
"btrfs"
))
{
if
(
!
strcmp
(
orig
->
type
,
"btrfs"
)
&&
!
strcmp
(
new
->
type
,
"btrfs"
))
{
bool
bret
=
false
;
bool
bret
=
false
;
if
(
snap
||
btrfs_same_fs
(
orig
->
dest
,
new
->
dest
)
==
0
)
if
(
snap
||
btrfs_same_fs
(
orig
->
dest
,
new
->
dest
)
==
0
)
bret
=
new
->
ops
->
create_snapshot
(
c0
->
lxc_conf
,
orig
,
new
,
0
);
bret
=
new
->
ops
->
create_snapshot
(
c0
->
lxc_conf
,
orig
,
new
);
else
else
bret
=
new
->
ops
->
create_clone
(
c0
->
lxc_conf
,
orig
,
new
,
0
);
bret
=
new
->
ops
->
create_clone
(
c0
->
lxc_conf
,
orig
,
new
,
0
);
if
(
!
bret
)
if
(
!
bret
)
...
...
src/lxc/bdev/bdev.h
View file @
8cc69880
...
@@ -76,7 +76,7 @@ struct bdev_ops {
...
@@ -76,7 +76,7 @@ struct bdev_ops {
bool
(
*
create_clone
)(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
bool
(
*
create_clone
)(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
struct
bdev
*
new
,
uint64_t
newsize
);
struct
bdev
*
new
,
uint64_t
newsize
);
bool
(
*
create_snapshot
)(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
bool
(
*
create_snapshot
)(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
struct
bdev
*
new
,
uint64_t
newsize
);
struct
bdev
*
new
);
bool
can_snapshot
;
bool
can_snapshot
;
bool
can_backup
;
bool
can_backup
;
};
};
...
...
src/lxc/bdev/lxcbtrfs.c
View file @
8cc69880
...
@@ -464,7 +464,7 @@ bool btrfs_create_clone(struct lxc_conf *conf, struct bdev *orig,
...
@@ -464,7 +464,7 @@ bool btrfs_create_clone(struct lxc_conf *conf, struct bdev *orig,
}
}
bool
btrfs_create_snapshot
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
bool
btrfs_create_snapshot
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
struct
bdev
*
new
,
uint64_t
newsize
)
struct
bdev
*
new
)
{
{
int
ret
;
int
ret
;
...
...
src/lxc/bdev/lxcbtrfs.h
View file @
8cc69880
...
@@ -416,6 +416,6 @@ int btrfs_snapshot_wrapper(void *data);
...
@@ -416,6 +416,6 @@ int btrfs_snapshot_wrapper(void *data);
bool
btrfs_create_clone
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
bool
btrfs_create_clone
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
struct
bdev
*
new
,
uint64_t
newsize
);
struct
bdev
*
new
,
uint64_t
newsize
);
bool
btrfs_create_snapshot
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
bool
btrfs_create_snapshot
(
struct
lxc_conf
*
conf
,
struct
bdev
*
orig
,
struct
bdev
*
new
,
uint64_t
newsize
);
struct
bdev
*
new
);
#endif // __LXC_BTRFS_H
#endif // __LXC_BTRFS_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