Merge branch 'work.dcache' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / notify / inotify / inotify_fsnotify.c

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index ff30abd6a49b1ad6d93e9ddc3b54c3b7c5ab2d74..7e8b131029f888265d6ad883deb6bf4e9ab846f3 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -67,7 +67,7 @@ static int inotify_merge(struct list_head *list,
 int inotify_handle_event(struct fsnotify_group *group,
                         struct inode *inode,
                         u32 mask, const void *data, int data_type,
-                        const unsigned char *file_name, u32 cookie,
+                        const struct qstr *file_name, u32 cookie,
                         struct fsnotify_iter_info *iter_info)
 {
        struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
@@ -89,7 +89,7 @@ int inotify_handle_event(struct fsnotify_group *group,
                        return 0;
        }
        if (file_name) {
-               len = strlen(file_name);
+               len = file_name->len;
                alloc_len += len + 1;
        }
 
@@ -129,7 +129,7 @@ int inotify_handle_event(struct fsnotify_group *group,
        event->sync_cookie = cookie;
        event->name_len = len;
        if (len)
-               strcpy(event->name, file_name);
+               strcpy(event->name, file_name->name);
 
        ret = fsnotify_add_event(group, fsn_event, inotify_merge);
        if (ret) {