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
53209ca4
Unverified
Commit
53209ca4
authored
Mar 26, 2020
by
Christian Brauner
Committed by
Stéphane Graber
Mar 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dir: use cleanup macro in dir_mount()
Signed-off-by:
Christian Brauner
<
christian.brauner@ubuntu.com
>
parent
039f2a91
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
dir.c
src/lxc/storage/dir.c
+1
-5
No files found.
src/lxc/storage/dir.c
View file @
53209ca4
...
...
@@ -138,7 +138,7 @@ bool dir_detect(const char *path)
int
dir_mount
(
struct
lxc_storage
*
bdev
)
{
char
*
mntdata
=
NULL
;
__do_free
char
*
mntdata
=
NULL
;
unsigned
long
mflags
=
0
,
mntflags
=
0
,
pflags
=
0
;
int
ret
;
const
char
*
src
;
...
...
@@ -152,14 +152,12 @@ int dir_mount(struct lxc_storage *bdev)
ret
=
parse_mntopts
(
bdev
->
mntopts
,
&
mntflags
,
&
mntdata
);
if
(
ret
<
0
)
{
ERROR
(
"Failed to parse mount options
\"
%s
\"
"
,
bdev
->
mntopts
);
free
(
mntdata
);
return
-
EINVAL
;
}
ret
=
parse_propagationopts
(
bdev
->
mntopts
,
&
pflags
);
if
(
ret
<
0
)
{
ERROR
(
"Failed to parse propagation options
\"
%s
\"
"
,
bdev
->
mntopts
);
free
(
mntdata
);
return
-
EINVAL
;
}
...
...
@@ -175,12 +173,10 @@ int dir_mount(struct lxc_storage *bdev)
if
(
ret
<
0
)
{
SYSERROR
(
"Failed to mount
\"
%s
\"
on
\"
%s
\"
"
,
src
,
bdev
->
dest
);
free
(
mntdata
);
return
-
1
;
}
TRACE
(
"Mounted
\"
%s
\"
on
\"
%s
\"
"
,
src
,
bdev
->
dest
);
free
(
mntdata
);
return
ret
;
}
...
...
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