projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm/migrate: correct failure handling if !hugepage_migration_support()
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
audit_watch.c
diff --git
a/kernel/audit_watch.c
b/kernel/audit_watch.c
index 22831c4d369c67d988b1f0702f9db51bac6275bf..2596fac5dcb4552a0d574decada597424df0587b 100644
(file)
--- a/
kernel/audit_watch.c
+++ b/
kernel/audit_watch.c
@@
-465,35
+465,27
@@
void audit_remove_watch_rule(struct audit_krule *krule)
}
}
}
}
-static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
- struct fsnotify_mark *inode_mark,
- struct fsnotify_mark *vfsmount_mark,
- __u32 mask, void *data, int data_type)
-{
- return true;
-}
-
/* Update watch data in audit rules based on fsnotify events. */
static int audit_watch_handle_event(struct fsnotify_group *group,
/* Update watch data in audit rules based on fsnotify events. */
static int audit_watch_handle_event(struct fsnotify_group *group,
+ struct inode *to_tell,
struct fsnotify_mark *inode_mark,
struct fsnotify_mark *vfsmount_mark,
struct fsnotify_mark *inode_mark,
struct fsnotify_mark *vfsmount_mark,
- struct fsnotify_event *event)
+ u32 mask, void *data, int data_type,
+ const unsigned char *dname)
{
struct inode *inode;
{
struct inode *inode;
- __u32 mask = event->mask;
- const char *dname = event->file_name;
struct audit_parent *parent;
parent = container_of(inode_mark, struct audit_parent, mark);
BUG_ON(group != audit_watch_group);
struct audit_parent *parent;
parent = container_of(inode_mark, struct audit_parent, mark);
BUG_ON(group != audit_watch_group);
- switch (
event->
data_type) {
+ switch (data_type) {
case (FSNOTIFY_EVENT_PATH):
case (FSNOTIFY_EVENT_PATH):
- inode =
event->path.
dentry->d_inode;
+ inode =
((struct path *)data)->
dentry->d_inode;
break;
case (FSNOTIFY_EVENT_INODE):
break;
case (FSNOTIFY_EVENT_INODE):
- inode =
event->inode
;
+ inode =
(struct inode *)data
;
break;
default:
BUG();
break;
default:
BUG();
@@
-512,11
+504,7
@@
static int audit_watch_handle_event(struct fsnotify_group *group,
}
static const struct fsnotify_ops audit_watch_fsnotify_ops = {
}
static const struct fsnotify_ops audit_watch_fsnotify_ops = {
- .should_send_event = audit_watch_should_send_event,
.handle_event = audit_watch_handle_event,
.handle_event = audit_watch_handle_event,
- .free_group_priv = NULL,
- .freeing_mark = NULL,
- .free_event_priv = NULL,
};
static int __init audit_watch_init(void)
};
static int __init audit_watch_init(void)