diff options
Diffstat (limited to 'fs/notify/fanotify')
-rw-r--r-- | fs/notify/fanotify/fanotify.c | 2 | ||||
-rw-r--r-- | fs/notify/fanotify/fanotify_user.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c index 881067dc7923..aa5e92661142 100644 --- a/fs/notify/fanotify/fanotify.c +++ b/fs/notify/fanotify/fanotify.c | |||
@@ -118,7 +118,7 @@ static bool fanotify_should_send_event(struct fsnotify_group *group, struct inod | |||
118 | if (data_type != FSNOTIFY_EVENT_PATH) | 118 | if (data_type != FSNOTIFY_EVENT_PATH) |
119 | return false; | 119 | return false; |
120 | 120 | ||
121 | fsn_mark = fsnotify_find_mark(group, inode); | 121 | fsn_mark = fsnotify_find_inode_mark(group, inode); |
122 | if (!fsn_mark) | 122 | if (!fsn_mark) |
123 | return false; | 123 | return false; |
124 | 124 | ||
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c index 66e38fc052b2..05351936a725 100644 --- a/fs/notify/fanotify/fanotify_user.c +++ b/fs/notify/fanotify/fanotify_user.c | |||
@@ -305,7 +305,7 @@ static int fanotify_remove_mark(struct fsnotify_group *group, | |||
305 | pr_debug("%s: group=%p inode=%p mask=%x\n", __func__, | 305 | pr_debug("%s: group=%p inode=%p mask=%x\n", __func__, |
306 | group, inode, mask); | 306 | group, inode, mask); |
307 | 307 | ||
308 | fsn_mark = fsnotify_find_mark(group, inode); | 308 | fsn_mark = fsnotify_find_inode_mark(group, inode); |
309 | if (!fsn_mark) | 309 | if (!fsn_mark) |
310 | return -ENOENT; | 310 | return -ENOENT; |
311 | 311 | ||
@@ -321,7 +321,7 @@ static int fanotify_remove_mark(struct fsnotify_group *group, | |||
321 | 321 | ||
322 | fsnotify_recalc_group_mask(group); | 322 | fsnotify_recalc_group_mask(group); |
323 | 323 | ||
324 | /* matches the fsnotify_find_mark() */ | 324 | /* matches the fsnotify_find_inode_mark() */ |
325 | fsnotify_put_mark(fsn_mark); | 325 | fsnotify_put_mark(fsn_mark); |
326 | 326 | ||
327 | return 0; | 327 | return 0; |
@@ -338,7 +338,7 @@ static int fanotify_add_mark(struct fsnotify_group *group, | |||
338 | pr_debug("%s: group=%p inode=%p mask=%x\n", __func__, | 338 | pr_debug("%s: group=%p inode=%p mask=%x\n", __func__, |
339 | group, inode, mask); | 339 | group, inode, mask); |
340 | 340 | ||
341 | fsn_mark = fsnotify_find_mark(group, inode); | 341 | fsn_mark = fsnotify_find_inode_mark(group, inode); |
342 | if (!fsn_mark) { | 342 | if (!fsn_mark) { |
343 | struct fsnotify_mark *new_fsn_mark; | 343 | struct fsnotify_mark *new_fsn_mark; |
344 | 344 | ||
@@ -348,7 +348,7 @@ static int fanotify_add_mark(struct fsnotify_group *group, | |||
348 | goto out; | 348 | goto out; |
349 | 349 | ||
350 | fsnotify_init_mark(new_fsn_mark, fanotify_free_mark); | 350 | fsnotify_init_mark(new_fsn_mark, fanotify_free_mark); |
351 | ret = fsnotify_add_mark(new_fsn_mark, group, inode, 0); | 351 | ret = fsnotify_add_mark(new_fsn_mark, group, inode, NULL, 0); |
352 | if (ret) { | 352 | if (ret) { |
353 | fanotify_free_mark(new_fsn_mark); | 353 | fanotify_free_mark(new_fsn_mark); |
354 | goto out; | 354 | goto out; |