diff options
| author | Amir Goldstein <amir73il@gmail.com> | 2020-03-19 17:10:12 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2020-03-23 18:19:06 +0100 |
| commit | aa93bdc5500cc93ba31afeda1a61610d117947ad (patch) | |
| tree | ea5f38b9d49a9e1b30fd02fb1f1a84c393e907e2 /fs/notify/inotify | |
| parent | a1aae0570a2b806937120921db2c5d3100ca55fc (diff) | |
| download | linux-aa93bdc5500cc93ba31afeda1a61610d117947ad.tar.bz2 | |
fsnotify: use helpers to access data by data_type
Create helpers to access path and inode from different data types.
Link: https://lore.kernel.org/r/20200319151022.31456-5-amir73il@gmail.com
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/notify/inotify')
| -rw-r--r-- | fs/notify/inotify/inotify_fsnotify.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c index d510223d302c..6bb98522bbfd 100644 --- a/fs/notify/inotify/inotify_fsnotify.c +++ b/fs/notify/inotify/inotify_fsnotify.c @@ -61,6 +61,7 @@ int inotify_handle_event(struct fsnotify_group *group, const struct qstr *file_name, u32 cookie, struct fsnotify_iter_info *iter_info) { + const struct path *path = fsnotify_data_path(data, data_type); struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info); struct inotify_inode_mark *i_mark; struct inotify_event_info *event; @@ -73,12 +74,9 @@ int inotify_handle_event(struct fsnotify_group *group, return 0; if ((inode_mark->mask & FS_EXCL_UNLINK) && - (data_type == FSNOTIFY_EVENT_PATH)) { - const struct path *path = data; + path && d_unlinked(path->dentry)) + return 0; - if (d_unlinked(path->dentry)) - return 0; - } if (file_name) { len = file_name->len; alloc_len += len + 1; |