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
115dd89d
Unverified
Commit
115dd89d
authored
Aug 15, 2017
by
Christian Brauner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "dir: non-functional changes"
This reverts commit
8f2896da
. Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
b70ffc20
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
lxcdir.c
src/lxc/bdev/lxcdir.c
+3
-6
No files found.
src/lxc/bdev/lxcdir.c
View file @
115dd89d
...
@@ -43,8 +43,7 @@ int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
...
@@ -43,8 +43,7 @@ int dir_clonepaths(struct bdev *orig, struct bdev *new, const char *oldname,
size_t
len
;
size_t
len
;
if
(
snap
)
{
if
(
snap
)
{
ERROR
(
"directories cannot be snapshotted. Try aufs or "
ERROR
(
"directories cannot be snapshotted. Try aufs or overlayfs."
);
"overlayfs."
);
return
-
1
;
return
-
1
;
}
}
...
@@ -151,13 +150,11 @@ int dir_mount(struct bdev *bdev)
...
@@ -151,13 +150,11 @@ int dir_mount(struct bdev *bdev)
src
=
lxc_storage_get_path
(
bdev
->
src
,
bdev
->
type
);
src
=
lxc_storage_get_path
(
bdev
->
src
,
bdev
->
type
);
ret
=
mount
(
src
,
bdev
->
dest
,
"bind"
,
MS_BIND
|
MS_REC
|
mntflags
,
ret
=
mount
(
src
,
bdev
->
dest
,
"bind"
,
MS_BIND
|
MS_REC
|
mntflags
,
mntdata
);
mntdata
);
if
((
0
==
ret
)
&&
(
mntflags
&
MS_RDONLY
))
{
if
((
0
==
ret
)
&&
(
mntflags
&
MS_RDONLY
))
{
DEBUG
(
"remounting %s on %s with readonly options"
,
DEBUG
(
"remounting %s on %s with readonly options"
,
src
?
src
:
"(none)"
,
bdev
->
dest
?
bdev
->
dest
:
"(none)"
);
src
?
src
:
"(none)"
,
bdev
->
dest
?
bdev
->
dest
:
"(none)"
);
mflags
=
add_required_remount_flags
(
mflags
=
add_required_remount_flags
(
src
,
bdev
->
dest
,
MS_BIND
|
MS_REC
|
mntflags
|
MS_REMOUNT
);
src
,
bdev
->
dest
,
MS_BIND
|
MS_REC
|
mntflags
|
MS_REMOUNT
);
ret
=
mount
(
src
,
bdev
->
dest
,
"bind"
,
mflags
,
mntdata
);
ret
=
mount
(
src
,
bdev
->
dest
,
"bind"
,
mflags
,
mntdata
);
}
}
...
...
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