3 files changed, 6 insertions, 6 deletions

diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c
index 37ae95cfb7f4..fb241805569c 100644
--- a/kernel/audit_fsnotify.c
+++ b/kernel/audit_fsnotify.c
@@ -164,7 +164,7 @@ static void audit_autoremove_mark_rule(struct audit_fsnotify_mark *audit_mark)
 static int audit_mark_handle_event(struct fsnotify_group *group,
                                     struct inode *to_tell,
                                     u32 mask, const void *data, int data_type,
-                                    const unsigned char *dname, u32 cookie,
+                                    const struct qstr *dname, u32 cookie,
                                     struct fsnotify_iter_info *iter_info)
 {
         struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
@@ -188,7 +188,7 @@ static int audit_mark_handle_event(struct fsnotify_group *group,
         }
 
         if (mask & (FS_CREATE|FS_MOVED_TO|FS_DELETE|FS_MOVED_FROM)) {
-                if (audit_compare_dname_path(dname, audit_mark->path, AUDIT_NAME_FULL))
+                if (audit_compare_dname_path(dname->name, audit_mark->path, AUDIT_NAME_FULL))
                         return 0;
                 audit_update_mark(audit_mark, inode);
         } else if (mask & (FS_DELETE_SELF|FS_UNMOUNT|FS_MOVE_SELF))
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index abfb112f26aa..e49c912f862d 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -1040,7 +1040,7 @@ static void evict_chunk(struct audit_chunk *chunk)
 static int audit_tree_handle_event(struct fsnotify_group *group,
                                    struct inode *to_tell,
                                    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)
 {
         return 0;
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index e8d1adeb2223..3c12fd5b680e 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -482,7 +482,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
 static int audit_watch_handle_event(struct fsnotify_group *group,
                                     struct inode *to_tell,
                                     u32 mask, const void *data, int data_type,
-                                    const unsigned char *dname, u32 cookie,
+                                    const struct qstr *dname, u32 cookie,
                                     struct fsnotify_iter_info *iter_info)
 {
         struct fsnotify_mark *inode_mark = fsnotify_iter_inode_mark(iter_info);
@@ -507,9 +507,9 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
         }
 
         if (mask & (FS_CREATE|FS_MOVED_TO) && inode)
-                audit_update_watch(parent, dname, inode->i_sb->s_dev, inode->i_ino, 0);
+                audit_update_watch(parent, dname->name, inode->i_sb->s_dev, inode->i_ino, 0);
         else if (mask & (FS_DELETE|FS_MOVED_FROM))
-                audit_update_watch(parent, dname, AUDIT_DEV_UNSET, AUDIT_INO_UNSET, 1);
+                audit_update_watch(parent, dname->name, AUDIT_DEV_UNSET, AUDIT_INO_UNSET, 1);
         else if (mask & (FS_DELETE_SELF|FS_UNMOUNT|FS_MOVE_SELF))
                 audit_remove_parent_watches(parent);