Merge tag 'for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[linux.git] / kernel / audit_watch.c

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index e8d1adeb22230b1df4a33762fb17f0f7f014668e..b50c574223fa6d74cb0942a12dc48b91725fe0d4 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -255,7 +255,7 @@ static void audit_watch_log_rule_change(struct audit_krule *r, struct audit_watc
 
 /* Update inode info in audit rules based on filesystem event. */
 static void audit_update_watch(struct audit_parent *parent,
-                              const char *dname, dev_t dev,
+                              const struct qstr *dname, dev_t dev,
                               unsigned long ino, unsigned invalidating)
 {
        struct audit_watch *owatch, *nwatch, *nextw;
@@ -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);