fsnotify: use unsigned char * for dentry->d_name.name

[pandora-kernel.git] / fs / notify / notification.c

diff --git a/fs/notify/notification.c b/fs/notify/notification.c
index 7fc8d00..b35faaf 100644 (file)
--- a/fs/notify/notification.c
+++ b/fs/notify/notification.c
@@ -137,7 +137,10 @@ struct fsnotify_event_private_data *fsnotify_remove_priv_from_event(struct fsnot
  */
 int fsnotify_add_notify_event(struct fsnotify_group *group, struct fsnotify_event *event,
                              struct fsnotify_event_private_data *priv,
-                             int (*merge)(struct list_head *, struct fsnotify_event *))
+                             int (*merge)(struct list_head *,
+                                          struct fsnotify_event *,
+                                          void **arg),
+                             void **arg)
 {
        struct fsnotify_event_holder *holder = NULL;
        struct list_head *list = &group->notification_list;
@@ -170,7 +173,7 @@ alloc_holder:
        if (!list_empty(list) && merge) {
                int ret;
 
-               ret = merge(list, event);
+               ret = merge(list, event, arg);
                if (ret) {
                        mutex_unlock(&group->notification_mutex);
                        if (holder != &event->holder)
@@ -367,8 +370,8 @@ struct fsnotify_event *fsnotify_clone_event(struct fsnotify_event *old_event)
  * @name the filename, if available
  */
 struct fsnotify_event *fsnotify_create_event(struct inode *to_tell, __u32 mask, void *data,
-                                            int data_type, const char *name, u32 cookie,
-                                            gfp_t gfp)
+                                            int data_type, const unsigned char *name,
+                                            u32 cookie, gfp_t gfp)
 {
        struct fsnotify_event *event;