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
3cd5eca8
Commit
3cd5eca8
authored
Nov 20, 2016
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fsnotify: constify 'data' passed to ->handle_event()
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
640eb7e7
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
20 deletions
+20
-20
fs/notify/dnotify/dnotify.c
fs/notify/dnotify/dnotify.c
+1
-1
fs/notify/fanotify/fanotify.c
fs/notify/fanotify/fanotify.c
+4
-4
fs/notify/fanotify/fanotify.h
fs/notify/fanotify/fanotify.h
+1
-1
fs/notify/inotify/inotify.h
fs/notify/inotify/inotify.h
+1
-1
fs/notify/inotify/inotify_fsnotify.c
fs/notify/inotify/inotify_fsnotify.c
+2
-2
include/linux/fsnotify_backend.h
include/linux/fsnotify_backend.h
+1
-1
kernel/audit_fsnotify.c
kernel/audit_fsnotify.c
+5
-5
kernel/audit_tree.c
kernel/audit_tree.c
+1
-1
kernel/audit_watch.c
kernel/audit_watch.c
+4
-4
No files found.
fs/notify/dnotify/dnotify.c
View file @
3cd5eca8
...
@@ -85,7 +85,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
...
@@ -85,7 +85,7 @@ static int dnotify_handle_event(struct fsnotify_group *group,
struct
inode
*
inode
,
struct
inode
*
inode
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
)
const
unsigned
char
*
file_name
,
u32
cookie
)
{
{
struct
dnotify_mark
*
dn_mark
;
struct
dnotify_mark
*
dn_mark
;
...
...
fs/notify/fanotify/fanotify.c
View file @
3cd5eca8
...
@@ -90,10 +90,10 @@ static int fanotify_get_response(struct fsnotify_group *group,
...
@@ -90,10 +90,10 @@ static int fanotify_get_response(struct fsnotify_group *group,
static
bool
fanotify_should_send_event
(
struct
fsnotify_mark
*
inode_mark
,
static
bool
fanotify_should_send_event
(
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmnt_mark
,
struct
fsnotify_mark
*
vfsmnt_mark
,
u32
event_mask
,
u32
event_mask
,
void
*
data
,
int
data_type
)
const
void
*
data
,
int
data_type
)
{
{
__u32
marks_mask
,
marks_ignored_mask
;
__u32
marks_mask
,
marks_ignored_mask
;
struct
path
*
path
=
data
;
const
struct
path
*
path
=
data
;
pr_debug
(
"%s: inode_mark=%p vfsmnt_mark=%p mask=%x data=%p"
pr_debug
(
"%s: inode_mark=%p vfsmnt_mark=%p mask=%x data=%p"
" data_type=%d
\n
"
,
__func__
,
inode_mark
,
vfsmnt_mark
,
" data_type=%d
\n
"
,
__func__
,
inode_mark
,
vfsmnt_mark
,
...
@@ -140,7 +140,7 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,
...
@@ -140,7 +140,7 @@ static bool fanotify_should_send_event(struct fsnotify_mark *inode_mark,
}
}
struct
fanotify_event_info
*
fanotify_alloc_event
(
struct
inode
*
inode
,
u32
mask
,
struct
fanotify_event_info
*
fanotify_alloc_event
(
struct
inode
*
inode
,
u32
mask
,
struct
path
*
path
)
const
struct
path
*
path
)
{
{
struct
fanotify_event_info
*
event
;
struct
fanotify_event_info
*
event
;
...
@@ -177,7 +177,7 @@ static int fanotify_handle_event(struct fsnotify_group *group,
...
@@ -177,7 +177,7 @@ static int fanotify_handle_event(struct fsnotify_group *group,
struct
inode
*
inode
,
struct
inode
*
inode
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
fanotify_mark
,
struct
fsnotify_mark
*
fanotify_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
)
const
unsigned
char
*
file_name
,
u32
cookie
)
{
{
int
ret
=
0
;
int
ret
=
0
;
...
...
fs/notify/fanotify/fanotify.h
View file @
3cd5eca8
...
@@ -47,4 +47,4 @@ static inline struct fanotify_event_info *FANOTIFY_E(struct fsnotify_event *fse)
...
@@ -47,4 +47,4 @@ static inline struct fanotify_event_info *FANOTIFY_E(struct fsnotify_event *fse)
}
}
struct
fanotify_event_info
*
fanotify_alloc_event
(
struct
inode
*
inode
,
u32
mask
,
struct
fanotify_event_info
*
fanotify_alloc_event
(
struct
inode
*
inode
,
u32
mask
,
struct
path
*
path
);
const
struct
path
*
path
);
fs/notify/inotify/inotify.h
View file @
3cd5eca8
...
@@ -26,7 +26,7 @@ extern int inotify_handle_event(struct fsnotify_group *group,
...
@@ -26,7 +26,7 @@ extern int inotify_handle_event(struct fsnotify_group *group,
struct
inode
*
inode
,
struct
inode
*
inode
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
);
const
unsigned
char
*
file_name
,
u32
cookie
);
extern
const
struct
fsnotify_ops
inotify_fsnotify_ops
;
extern
const
struct
fsnotify_ops
inotify_fsnotify_ops
;
fs/notify/inotify/inotify_fsnotify.c
View file @
3cd5eca8
...
@@ -66,7 +66,7 @@ int inotify_handle_event(struct fsnotify_group *group,
...
@@ -66,7 +66,7 @@ int inotify_handle_event(struct fsnotify_group *group,
struct
inode
*
inode
,
struct
inode
*
inode
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
)
const
unsigned
char
*
file_name
,
u32
cookie
)
{
{
struct
inotify_inode_mark
*
i_mark
;
struct
inotify_inode_mark
*
i_mark
;
...
@@ -80,7 +80,7 @@ int inotify_handle_event(struct fsnotify_group *group,
...
@@ -80,7 +80,7 @@ int inotify_handle_event(struct fsnotify_group *group,
if
((
inode_mark
->
mask
&
FS_EXCL_UNLINK
)
&&
if
((
inode_mark
->
mask
&
FS_EXCL_UNLINK
)
&&
(
data_type
==
FSNOTIFY_EVENT_PATH
))
{
(
data_type
==
FSNOTIFY_EVENT_PATH
))
{
struct
path
*
path
=
data
;
const
struct
path
*
path
=
data
;
if
(
d_unlinked
(
path
->
dentry
))
if
(
d_unlinked
(
path
->
dentry
))
return
0
;
return
0
;
...
...
include/linux/fsnotify_backend.h
View file @
3cd5eca8
...
@@ -96,7 +96,7 @@ struct fsnotify_ops {
...
@@ -96,7 +96,7 @@ struct fsnotify_ops {
struct
inode
*
inode
,
struct
inode
*
inode
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
);
const
unsigned
char
*
file_name
,
u32
cookie
);
void
(
*
free_group_priv
)(
struct
fsnotify_group
*
group
);
void
(
*
free_group_priv
)(
struct
fsnotify_group
*
group
);
void
(
*
freeing_mark
)(
struct
fsnotify_mark
*
mark
,
struct
fsnotify_group
*
group
);
void
(
*
freeing_mark
)(
struct
fsnotify_mark
*
mark
,
struct
fsnotify_group
*
group
);
...
...
kernel/audit_fsnotify.c
View file @
3cd5eca8
...
@@ -74,7 +74,7 @@ int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_
...
@@ -74,7 +74,7 @@ int audit_mark_compare(struct audit_fsnotify_mark *mark, unsigned long ino, dev_
}
}
static
void
audit_update_mark
(
struct
audit_fsnotify_mark
*
audit_mark
,
static
void
audit_update_mark
(
struct
audit_fsnotify_mark
*
audit_mark
,
struct
inode
*
inode
)
const
struct
inode
*
inode
)
{
{
audit_mark
->
dev
=
inode
?
inode
->
i_sb
->
s_dev
:
AUDIT_DEV_UNSET
;
audit_mark
->
dev
=
inode
?
inode
->
i_sb
->
s_dev
:
AUDIT_DEV_UNSET
;
audit_mark
->
ino
=
inode
?
inode
->
i_ino
:
AUDIT_INO_UNSET
;
audit_mark
->
ino
=
inode
?
inode
->
i_ino
:
AUDIT_INO_UNSET
;
...
@@ -168,11 +168,11 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
...
@@ -168,11 +168,11 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
struct
inode
*
to_tell
,
struct
inode
*
to_tell
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
dname
,
u32
cookie
)
const
unsigned
char
*
dname
,
u32
cookie
)
{
{
struct
audit_fsnotify_mark
*
audit_mark
;
struct
audit_fsnotify_mark
*
audit_mark
;
struct
inode
*
inode
=
NULL
;
const
struct
inode
*
inode
=
NULL
;
audit_mark
=
container_of
(
inode_mark
,
struct
audit_fsnotify_mark
,
mark
);
audit_mark
=
container_of
(
inode_mark
,
struct
audit_fsnotify_mark
,
mark
);
...
@@ -180,10 +180,10 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
...
@@ -180,10 +180,10 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
switch
(
data_type
)
{
switch
(
data_type
)
{
case
(
FSNOTIFY_EVENT_PATH
):
case
(
FSNOTIFY_EVENT_PATH
):
inode
=
((
struct
path
*
)
data
)
->
dentry
->
d_inode
;
inode
=
((
const
struct
path
*
)
data
)
->
dentry
->
d_inode
;
break
;
break
;
case
(
FSNOTIFY_EVENT_INODE
):
case
(
FSNOTIFY_EVENT_INODE
):
inode
=
(
struct
inode
*
)
data
;
inode
=
(
const
struct
inode
*
)
data
;
break
;
break
;
default:
default:
BUG
();
BUG
();
...
...
kernel/audit_tree.c
View file @
3cd5eca8
...
@@ -948,7 +948,7 @@ static int audit_tree_handle_event(struct fsnotify_group *group,
...
@@ -948,7 +948,7 @@ static int audit_tree_handle_event(struct fsnotify_group *group,
struct
inode
*
to_tell
,
struct
inode
*
to_tell
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
file_name
,
u32
cookie
)
const
unsigned
char
*
file_name
,
u32
cookie
)
{
{
return
0
;
return
0
;
...
...
kernel/audit_watch.c
View file @
3cd5eca8
...
@@ -472,10 +472,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
...
@@ -472,10 +472,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
struct
inode
*
to_tell
,
struct
inode
*
to_tell
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
inode_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
struct
fsnotify_mark
*
vfsmount_mark
,
u32
mask
,
void
*
data
,
int
data_type
,
u32
mask
,
const
void
*
data
,
int
data_type
,
const
unsigned
char
*
dname
,
u32
cookie
)
const
unsigned
char
*
dname
,
u32
cookie
)
{
{
struct
inode
*
inode
;
const
struct
inode
*
inode
;
struct
audit_parent
*
parent
;
struct
audit_parent
*
parent
;
parent
=
container_of
(
inode_mark
,
struct
audit_parent
,
mark
);
parent
=
container_of
(
inode_mark
,
struct
audit_parent
,
mark
);
...
@@ -484,10 +484,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
...
@@ -484,10 +484,10 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
switch
(
data_type
)
{
switch
(
data_type
)
{
case
(
FSNOTIFY_EVENT_PATH
):
case
(
FSNOTIFY_EVENT_PATH
):
inode
=
d_backing_inode
(((
struct
path
*
)
data
)
->
dentry
);
inode
=
d_backing_inode
(((
const
struct
path
*
)
data
)
->
dentry
);
break
;
break
;
case
(
FSNOTIFY_EVENT_INODE
):
case
(
FSNOTIFY_EVENT_INODE
):
inode
=
(
struct
inode
*
)
data
;
inode
=
(
const
struct
inode
*
)
data
;
break
;
break
;
default:
default:
BUG
();
BUG
();
...
...
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