Pull fsnotify updates from Jan Kara: "A few fsnotify fixes from Amir fixing fallout from big fsnotify overhaul a few months back and an improvement of defaults limiting maximum number of inotify watches from Waiman" * tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: fsnotify: fix events reported to watching parent and child inotify: convert to handle_inode_event() interface fsnotify: generalize handle_inode_event() inotify: Increase default inotify.max_user_watches limit to 1048576
Showing the changes to kernel (3 of 11 files). Show all
Unified · Split
| @@ -154,7 +154,7 @@ static void audit_autoremove_mark_rule(struct audit_fsnotify_mark *audit_mark) · 153 unmodified lines | ||
| 154 | 154 | /* Update mark data in audit rules based on fsnotify events. */ |
| 155 | 155 | static int audit_mark_handle_event(struct fsnotify_mark *inode_mark, u32 mask, |
| 156 | 156 | struct inode *inode, struct inode *dir, |
| 157 | − const struct qstr *dname) | |
| 157 | + const struct qstr *dname, u32 cookie) | |
| 158 | 158 | { |
| 159 | 159 | struct audit_fsnotify_mark *audit_mark; |
| 160 | 160 | |
| @@ -1037,7 +1037,7 @@ static void evict_chunk(struct audit_chunk *chunk) · 1036 unmodified lines | ||
| 1037 | 1037 | |
| 1038 | 1038 | static int audit_tree_handle_event(struct fsnotify_mark *mark, u32 mask, |
| 1039 | 1039 | struct inode *inode, struct inode *dir, |
| 1040 | − const struct qstr *file_name) | |
| 1040 | + const struct qstr *file_name, u32 cookie) | |
| 1041 | 1041 | { |
| 1042 | 1042 | return 0; |
| 1043 | 1043 | } |
| @@ -466,7 +466,7 @@ void audit_remove_watch_rule(struct audit_krule *krule) · 465 unmodified lines | ||
| 466 | 466 | /* Update watch data in audit rules based on fsnotify events. */ |
| 467 | 467 | static int audit_watch_handle_event(struct fsnotify_mark *inode_mark, u32 mask, |
| 468 | 468 | struct inode *inode, struct inode *dir, |
| 469 | − const struct qstr *dname) | |
| 469 | + const struct qstr *dname, u32 cookie) | |
| 470 | 470 | { |
| 471 | 471 | struct audit_parent *parent; |
| 472 | 472 | |