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
0dd4788a
Commit
0dd4788a
authored
May 09, 2021
by
Jeff Cook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reflow ZFS check to follow the style of the overlayfs return.
Per
https://github.com/lxc/lxc/pull/3831#discussion_r628865713
Signed-off-by:
Jeff Cook
<
jeff@jeffcook.io
>
parent
4bc6ecbf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
conf.c
src/lxc/conf.c
+6
-9
No files found.
src/lxc/conf.c
View file @
0dd4788a
...
...
@@ -543,16 +543,13 @@ int lxc_rootfs_init(struct lxc_conf *conf, bool userns)
return
syserror_set
(
-
EINVAL
,
"Idmapped rootfs currently only supports the
\"
dir
\"
storage driver"
);
}
if
(
rootfs
->
bdev_type
&&
strequal
(
rootfs
->
bdev_type
,
"zfs"
))
{
TRACE
(
"Not pinning because container uses ZFS"
);
goto
out
;
}
if
(
rootfs
->
path
)
{
if
(
rootfs
->
bdev_type
&&
(
strequal
(
rootfs
->
bdev_type
,
"overlay"
)
||
strequal
(
rootfs
->
bdev_type
,
"overlayfs"
)))
return
log_trace_errno
(
0
,
EINVAL
,
"Not pinning on stacking filesystem"
);
if
(
rootfs
->
bdev_type
)
{
if
(
strequal
(
rootfs
->
bdev_type
,
"overlay"
)
||
strequal
(
rootfs
->
bdev_type
,
"overlayfs"
))
return
log_trace_errno
(
0
,
EINVAL
,
"Not pinning on stacking filesystem"
);
if
(
strequal
(
rootfs
->
bdev_type
,
"zfs"
))
return
log_trace_errno
(
0
,
EINVAL
,
"Not pinning on ZFS filesystem"
);
}
dfd_path
=
open_at
(
-
EBADF
,
rootfs
->
path
,
PROTECT_OPATH_FILE
,
0
,
0
);
}
else
{
...
...
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