diff options
Diffstat (limited to 'fs/notify/inotify/inotify_user.c')
-rw-r--r-- | fs/notify/inotify/inotify_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 4b1587f9df3b..7be5dcf07ac7 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c | |||
@@ -386,7 +386,7 @@ static struct inotify_inode_mark_entry *inotify_idr_find_locked(struct fsnotify_ | |||
386 | 386 | ||
387 | ientry = idr_find(idr, wd); | 387 | ientry = idr_find(idr, wd); |
388 | if (ientry) { | 388 | if (ientry) { |
389 | struct fsnotify_mark_entry *fsn_entry = &ientry->fsn_entry; | 389 | struct fsnotify_mark *fsn_entry = &ientry->fsn_entry; |
390 | 390 | ||
391 | fsnotify_get_mark(fsn_entry); | 391 | fsnotify_get_mark(fsn_entry); |
392 | /* One ref for being in the idr, one ref we just took */ | 392 | /* One ref for being in the idr, one ref we just took */ |
@@ -499,7 +499,7 @@ out: | |||
499 | /* | 499 | /* |
500 | * Send IN_IGNORED for this wd, remove this wd from the idr. | 500 | * Send IN_IGNORED for this wd, remove this wd from the idr. |
501 | */ | 501 | */ |
502 | void inotify_ignored_and_remove_idr(struct fsnotify_mark_entry *entry, | 502 | void inotify_ignored_and_remove_idr(struct fsnotify_mark *entry, |
503 | struct fsnotify_group *group) | 503 | struct fsnotify_group *group) |
504 | { | 504 | { |
505 | struct inotify_inode_mark_entry *ientry; | 505 | struct inotify_inode_mark_entry *ientry; |
@@ -541,7 +541,7 @@ skip_send_ignore: | |||
541 | } | 541 | } |
542 | 542 | ||
543 | /* ding dong the mark is dead */ | 543 | /* ding dong the mark is dead */ |
544 | static void inotify_free_mark(struct fsnotify_mark_entry *entry) | 544 | static void inotify_free_mark(struct fsnotify_mark *entry) |
545 | { | 545 | { |
546 | struct inotify_inode_mark_entry *ientry; | 546 | struct inotify_inode_mark_entry *ientry; |
547 | 547 | ||
@@ -554,7 +554,7 @@ static int inotify_update_existing_watch(struct fsnotify_group *group, | |||
554 | struct inode *inode, | 554 | struct inode *inode, |
555 | u32 arg) | 555 | u32 arg) |
556 | { | 556 | { |
557 | struct fsnotify_mark_entry *entry; | 557 | struct fsnotify_mark *entry; |
558 | struct inotify_inode_mark_entry *ientry; | 558 | struct inotify_inode_mark_entry *ientry; |
559 | __u32 old_mask, new_mask; | 559 | __u32 old_mask, new_mask; |
560 | __u32 mask; | 560 | __u32 mask; |