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
8ddf877b
Commit
8ddf877b
authored
Jan 30, 2014
by
Stéphane Graber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bdev: Rename mount_unknow_fs to mount_unknown_fs
Signed-off-by:
Stéphane Graber
<
stgraber@ubuntu.com
>
Acked-by:
Serge E. Hallyn
<
serge.hallyn@ubuntu.com
>
parent
b2a3f33e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
bdev.c
src/lxc/bdev.c
+5
-5
conf.c
src/lxc/conf.c
+3
-3
No files found.
src/lxc/bdev.c
View file @
8ddf877b
...
@@ -146,7 +146,7 @@ static int find_fstype_cb(char* buffer, void *data)
...
@@ -146,7 +146,7 @@ static int find_fstype_cb(char* buffer, void *data)
return
1
;
return
1
;
}
}
static
int
mount_unknow_fs
(
const
char
*
rootfs
,
const
char
*
target
,
int
mntopt
)
static
int
mount_unknow
n
_fs
(
const
char
*
rootfs
,
const
char
*
target
,
int
mntopt
)
{
{
int
i
;
int
i
;
...
@@ -289,7 +289,7 @@ static int detect_fs(struct bdev *bdev, char *type, int len)
...
@@ -289,7 +289,7 @@ static int detect_fs(struct bdev *bdev, char *type, int len)
if
(
unshare
(
CLONE_NEWNS
)
<
0
)
if
(
unshare
(
CLONE_NEWNS
)
<
0
)
exit
(
1
);
exit
(
1
);
ret
=
mount_unknow_fs
(
srcdev
,
bdev
->
dest
,
0
);
ret
=
mount_unknow
n
_fs
(
srcdev
,
bdev
->
dest
,
0
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
ERROR
(
"failed mounting %s onto %s to detect fstype"
,
srcdev
,
bdev
->
dest
);
ERROR
(
"failed mounting %s onto %s to detect fstype"
,
srcdev
,
bdev
->
dest
);
exit
(
1
);
exit
(
1
);
...
@@ -780,8 +780,8 @@ static int lvm_mount(struct bdev *bdev)
...
@@ -780,8 +780,8 @@ static int lvm_mount(struct bdev *bdev)
if
(
!
bdev
->
src
||
!
bdev
->
dest
)
if
(
!
bdev
->
src
||
!
bdev
->
dest
)
return
-
22
;
return
-
22
;
/* if we might pass in data sometime, then we'll have to enrich
/* if we might pass in data sometime, then we'll have to enrich
* mount_unknow_fs */
* mount_unknow
n
_fs */
return
mount_unknow_fs
(
bdev
->
src
,
bdev
->
dest
,
0
);
return
mount_unknow
n
_fs
(
bdev
->
src
,
bdev
->
dest
,
0
);
}
}
static
int
lvm_umount
(
struct
bdev
*
bdev
)
static
int
lvm_umount
(
struct
bdev
*
bdev
)
...
@@ -1506,7 +1506,7 @@ static int loop_mount(struct bdev *bdev)
...
@@ -1506,7 +1506,7 @@ static int loop_mount(struct bdev *bdev)
goto
out
;
goto
out
;
}
}
ret
=
mount_unknow_fs
(
loname
,
bdev
->
dest
,
0
);
ret
=
mount_unknow
n
_fs
(
loname
,
bdev
->
dest
,
0
);
if
(
ret
<
0
)
if
(
ret
<
0
)
ERROR
(
"Error mounting %s
\n
"
,
bdev
->
src
);
ERROR
(
"Error mounting %s
\n
"
,
bdev
->
src
);
else
else
...
...
src/lxc/conf.c
View file @
8ddf877b
...
@@ -451,7 +451,7 @@ static int find_fstype_cb(char* buffer, void *data)
...
@@ -451,7 +451,7 @@ static int find_fstype_cb(char* buffer, void *data)
return
1
;
return
1
;
}
}
static
int
mount_unknow_fs
(
const
char
*
rootfs
,
const
char
*
target
,
int
mntopt
)
static
int
mount_unknow
n
_fs
(
const
char
*
rootfs
,
const
char
*
target
,
int
mntopt
)
{
{
int
i
;
int
i
;
...
@@ -585,7 +585,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
...
@@ -585,7 +585,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
ret
=
setup_lodev
(
rootfs
,
fd
,
&
loinfo
);
ret
=
setup_lodev
(
rootfs
,
fd
,
&
loinfo
);
if
(
!
ret
)
if
(
!
ret
)
ret
=
mount_unknow_fs
(
path
,
target
,
0
);
ret
=
mount_unknow
n
_fs
(
path
,
target
,
0
);
close
(
fd
);
close
(
fd
);
break
;
break
;
...
@@ -599,7 +599,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
...
@@ -599,7 +599,7 @@ static int mount_rootfs_file(const char *rootfs, const char *target)
static
int
mount_rootfs_block
(
const
char
*
rootfs
,
const
char
*
target
)
static
int
mount_rootfs_block
(
const
char
*
rootfs
,
const
char
*
target
)
{
{
return
mount_unknow_fs
(
rootfs
,
target
,
0
);
return
mount_unknow
n
_fs
(
rootfs
,
target
,
0
);
}
}
/*
/*
...
...
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