MTD: Fix wrong check register_blkdev return value

[net-next-2.6.git] / kernel / audit_watch.c

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index a273cf340527d1b4e54319ddba5bd559443d9fe0..f0c9b2e7542dfd5b2980164a2f5ccedbcd2bb0d1 100644 (file)
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -503,7 +503,7 @@ void audit_remove_watch_rule(struct audit_krule *krule)
 }
 
 static bool audit_watch_should_send_event(struct fsnotify_group *group, struct inode *inode,
-                                         struct vfsmount *mnt, struct fsnotify_mark *inode_mark,
+                                         struct fsnotify_mark *inode_mark,
                                          struct fsnotify_mark *vfsmount_mark,
                                          __u32 mask, void *data, int data_type)
 {
@@ -526,8 +526,8 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
        BUG_ON(group != audit_watch_group);
 
        switch (event->data_type) {
-       case (FSNOTIFY_EVENT_FILE):
-               inode = event->file->f_path.dentry->d_inode;
+       case (FSNOTIFY_EVENT_PATH):
+               inode = event->path.dentry->d_inode;
                break;
        case (FSNOTIFY_EVENT_INODE):
                inode = event->inode;