fsnotify: rename fsnotify_find_mark_entry to fsnotify_find_mark

[pandora-kernel.git] / fs / notify / inotify / inotify_fsnotify.c

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 3edb51c..f8a2a6e 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -88,7 +88,7 @@ static int inotify_merge(struct list_head *list, struct fsnotify_event *event)
 
 static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_event *event)
 {
-       struct fsnotify_mark_entry *entry;
+       struct fsnotify_mark *entry;
        struct inotify_inode_mark_entry *ientry;
        struct inode *to_tell;
        struct inotify_event_private_data *event_priv;
@@ -98,7 +98,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
        to_tell = event->to_tell;
 
        spin_lock(&to_tell->i_lock);
-       entry = fsnotify_find_mark_entry(group, to_tell);
+       entry = fsnotify_find_mark(group, to_tell);
        spin_unlock(&to_tell->i_lock);
        /* race with watch removal?  We already passes should_send */
        if (unlikely(!entry))
@@ -135,7 +135,7 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
        return ret;
 }
 
-static void inotify_freeing_mark(struct fsnotify_mark_entry *entry, struct fsnotify_group *group)
+static void inotify_freeing_mark(struct fsnotify_mark *entry, struct fsnotify_group *group)
 {
        inotify_ignored_and_remove_idr(entry, group);
 }
@@ -144,11 +144,11 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
                                      struct vfsmount *mnt, __u32 mask, void *data,
                                      int data_type)
 {
-       struct fsnotify_mark_entry *entry;
+       struct fsnotify_mark *entry;
        bool send;
 
        spin_lock(&inode->i_lock);
-       entry = fsnotify_find_mark_entry(group, inode);
+       entry = fsnotify_find_mark(group, inode);
        spin_unlock(&inode->i_lock);
        if (!entry)
                return false;
@@ -171,7 +171,7 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
  */
 static int idr_callback(int id, void *p, void *data)
 {
-       struct fsnotify_mark_entry *entry;
+       struct fsnotify_mark *entry;
        struct inotify_inode_mark_entry *ientry;
        static bool warned = false;