diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-17 10:56:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-17 10:56:27 -0800 |
| commit | 14bd41e41899cbd1de4bb5ddfa46c85b08091a69 (patch) | |
| tree | 0e19281131adc23e9f078a09e7de661dcdf28e4a /fs/notify/dnotify | |
| parent | d652d5f1eeeb06046009f4fcb9b4542249526916 (diff) | |
| parent | fecc4559780d52d174ea05e3bf543669165389c3 (diff) | |
Merge tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
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
Diffstat (limited to 'fs/notify/dnotify')
| -rw-r--r-- | fs/notify/dnotify/dnotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c index 5486aaca60b0..e85e13c50d6d 100644 --- a/fs/notify/dnotify/dnotify.c +++ b/fs/notify/dnotify/dnotify.c @@ -72,7 +72,7 @@ static void dnotify_recalc_inode_mask(struct fsnotify_mark *fsn_mark) */ static int dnotify_handle_event(struct fsnotify_mark *inode_mark, u32 mask, struct inode *inode, struct inode *dir, - const struct qstr *name) + const struct qstr *name, u32 cookie) { struct dnotify_mark *dn_mark; struct dnotify_struct *dn; |