Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
808d4e3c
Commit
808d4e3c
authored
Oct 11, 2012
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consitify do_mount() arguments
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
4b2c551f
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
26 deletions
+27
-26
fs/namespace.c
fs/namespace.c
+6
-6
include/linux/fs.h
include/linux/fs.h
+1
-1
include/linux/security.h
include/linux/security.h
+6
-6
security/capability.c
security/capability.c
+2
-2
security/security.c
security/security.c
+2
-2
security/selinux/hooks.c
security/selinux/hooks.c
+2
-2
security/smack/smack_lsm.c
security/smack/smack_lsm.c
+2
-2
security/tomoyo/common.h
security/tomoyo/common.h
+1
-1
security/tomoyo/mount.c
security/tomoyo/mount.c
+3
-2
security/tomoyo/tomoyo.c
security/tomoyo/tomoyo.c
+2
-2
No files found.
fs/namespace.c
View file @
808d4e3c
...
...
@@ -1640,7 +1640,7 @@ static int do_change_type(struct path *path, int flag)
/*
* do loopback mount.
*/
static
int
do_loopback
(
struct
path
*
path
,
char
*
old_name
,
static
int
do_loopback
(
struct
path
*
path
,
c
onst
c
har
*
old_name
,
int
recurse
)
{
LIST_HEAD
(
umount_list
);
...
...
@@ -1764,7 +1764,7 @@ static inline int tree_contains_unbindable(struct mount *mnt)
return
0
;
}
static
int
do_move_mount
(
struct
path
*
path
,
char
*
old_name
)
static
int
do_move_mount
(
struct
path
*
path
,
c
onst
c
har
*
old_name
)
{
struct
path
old_path
,
parent_path
;
struct
mount
*
p
;
...
...
@@ -1917,8 +1917,8 @@ static int do_add_mount(struct mount *newmnt, struct path *path, int mnt_flags)
* create a new mount for userspace and request it to be added into the
* namespace's tree
*/
static
int
do_new_mount
(
struct
path
*
path
,
char
*
type
,
int
flags
,
int
mnt_flags
,
char
*
name
,
void
*
data
)
static
int
do_new_mount
(
struct
path
*
path
,
c
onst
c
har
*
type
,
int
flags
,
int
mnt_flags
,
c
onst
c
har
*
name
,
void
*
data
)
{
struct
vfsmount
*
mnt
;
int
err
;
...
...
@@ -2191,8 +2191,8 @@ int copy_mount_string(const void __user *data, char **where)
* Therefore, if this magic number is present, it carries no information
* and must be discarded.
*/
long
do_mount
(
c
har
*
dev_name
,
char
*
dir_name
,
char
*
type_pag
e
,
unsigned
long
flags
,
void
*
data_page
)
long
do_mount
(
c
onst
char
*
dev_name
,
const
char
*
dir_nam
e
,
const
char
*
type_page
,
unsigned
long
flags
,
void
*
data_page
)
{
struct
path
path
;
int
retval
=
0
;
...
...
include/linux/fs.h
View file @
808d4e3c
...
...
@@ -2075,7 +2075,7 @@ extern struct vfsmount *kern_mount_data(struct file_system_type *, void *data);
extern
void
kern_unmount
(
struct
vfsmount
*
mnt
);
extern
int
may_umount_tree
(
struct
vfsmount
*
);
extern
int
may_umount
(
struct
vfsmount
*
);
extern
long
do_mount
(
c
har
*
,
char
*
,
char
*
,
unsigned
long
,
void
*
);
extern
long
do_mount
(
c
onst
char
*
,
const
char
*
,
const
char
*
,
unsigned
long
,
void
*
);
extern
struct
vfsmount
*
collect_mounts
(
struct
path
*
);
extern
void
drop_collected_mounts
(
struct
vfsmount
*
);
extern
int
iterate_mounts
(
int
(
*
)(
struct
vfsmount
*
,
void
*
),
void
*
,
...
...
include/linux/security.h
View file @
808d4e3c
...
...
@@ -1411,8 +1411,8 @@ struct security_operations {
int
(
*
sb_kern_mount
)
(
struct
super_block
*
sb
,
int
flags
,
void
*
data
);
int
(
*
sb_show_options
)
(
struct
seq_file
*
m
,
struct
super_block
*
sb
);
int
(
*
sb_statfs
)
(
struct
dentry
*
dentry
);
int
(
*
sb_mount
)
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
);
int
(
*
sb_mount
)
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
);
int
(
*
sb_umount
)
(
struct
vfsmount
*
mnt
,
int
flags
);
int
(
*
sb_pivotroot
)
(
struct
path
*
old_path
,
struct
path
*
new_path
);
...
...
@@ -1694,8 +1694,8 @@ int security_sb_remount(struct super_block *sb, void *data);
int
security_sb_kern_mount
(
struct
super_block
*
sb
,
int
flags
,
void
*
data
);
int
security_sb_show_options
(
struct
seq_file
*
m
,
struct
super_block
*
sb
);
int
security_sb_statfs
(
struct
dentry
*
dentry
);
int
security_sb_mount
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
);
int
security_sb_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
);
int
security_sb_umount
(
struct
vfsmount
*
mnt
,
int
flags
);
int
security_sb_pivotroot
(
struct
path
*
old_path
,
struct
path
*
new_path
);
int
security_sb_set_mnt_opts
(
struct
super_block
*
sb
,
struct
security_mnt_opts
*
opts
);
...
...
@@ -1964,8 +1964,8 @@ static inline int security_sb_statfs(struct dentry *dentry)
return
0
;
}
static
inline
int
security_sb_mount
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
static
inline
int
security_sb_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
)
{
return
0
;
...
...
security/capability.c
View file @
808d4e3c
...
...
@@ -74,8 +74,8 @@ static int cap_sb_statfs(struct dentry *dentry)
return
0
;
}
static
int
cap_sb_mount
(
c
har
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
)
static
int
cap_sb_mount
(
c
onst
char
*
dev_name
,
struct
path
*
path
,
const
char
*
type
,
unsigned
long
flags
,
void
*
data
)
{
return
0
;
}
...
...
security/security.c
View file @
808d4e3c
...
...
@@ -276,8 +276,8 @@ int security_sb_statfs(struct dentry *dentry)
return
security_ops
->
sb_statfs
(
dentry
);
}
int
security_sb_mount
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
)
int
security_sb_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
)
{
return
security_ops
->
sb_mount
(
dev_name
,
path
,
type
,
flags
,
data
);
}
...
...
security/selinux/hooks.c
View file @
808d4e3c
...
...
@@ -2452,9 +2452,9 @@ static int selinux_sb_statfs(struct dentry *dentry)
return
superblock_has_perm
(
cred
,
dentry
->
d_sb
,
FILESYSTEM__GETATTR
,
&
ad
);
}
static
int
selinux_mount
(
char
*
dev_name
,
static
int
selinux_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
char
*
type
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
)
{
...
...
security/smack/smack_lsm.c
View file @
808d4e3c
...
...
@@ -408,8 +408,8 @@ static int smack_sb_statfs(struct dentry *dentry)
* Returns 0 if current can write the floor of the filesystem
* being mounted on, an error code otherwise.
*/
static
int
smack_sb_mount
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
)
static
int
smack_sb_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
)
{
struct
superblock_smack
*
sbp
=
path
->
dentry
->
d_sb
->
s_security
;
struct
smk_audit_info
ad
;
...
...
security/tomoyo/common.h
View file @
808d4e3c
...
...
@@ -970,7 +970,7 @@ int tomoyo_init_request_info(struct tomoyo_request_info *r,
const
u8
index
);
int
tomoyo_mkdev_perm
(
const
u8
operation
,
struct
path
*
path
,
const
unsigned
int
mode
,
unsigned
int
dev
);
int
tomoyo_mount_permission
(
char
*
dev_name
,
struct
path
*
path
,
int
tomoyo_mount_permission
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
const
char
*
type
,
unsigned
long
flags
,
void
*
data_page
);
int
tomoyo_open_control
(
const
u8
type
,
struct
file
*
file
);
...
...
security/tomoyo/mount.c
View file @
808d4e3c
...
...
@@ -71,7 +71,8 @@ static bool tomoyo_check_mount_acl(struct tomoyo_request_info *r,
*
* Caller holds tomoyo_read_lock().
*/
static
int
tomoyo_mount_acl
(
struct
tomoyo_request_info
*
r
,
char
*
dev_name
,
static
int
tomoyo_mount_acl
(
struct
tomoyo_request_info
*
r
,
const
char
*
dev_name
,
struct
path
*
dir
,
const
char
*
type
,
unsigned
long
flags
)
{
...
...
@@ -183,7 +184,7 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r, char *dev_name,
*
* Returns 0 on success, negative value otherwise.
*/
int
tomoyo_mount_permission
(
char
*
dev_name
,
struct
path
*
path
,
int
tomoyo_mount_permission
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
const
char
*
type
,
unsigned
long
flags
,
void
*
data_page
)
{
...
...
security/tomoyo/tomoyo.c
View file @
808d4e3c
...
...
@@ -408,8 +408,8 @@ static int tomoyo_path_chroot(struct path *path)
*
* Returns 0 on success, negative value otherwise.
*/
static
int
tomoyo_sb_mount
(
char
*
dev_name
,
struct
path
*
path
,
char
*
type
,
unsigned
long
flags
,
void
*
data
)
static
int
tomoyo_sb_mount
(
c
onst
c
har
*
dev_name
,
struct
path
*
path
,
c
onst
c
har
*
type
,
unsigned
long
flags
,
void
*
data
)
{
return
tomoyo_mount_permission
(
dev_name
,
path
,
type
,
flags
,
data
);
}
...
...
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