VFS: audit: d_backing_inode() annotations

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 7 insertions, 7 deletions

diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index ad9c1682f616..6e30024d9aac 100644
--- a/kernel/audit_watch.c
+++ b/kernel/audit_watch.c
@@ -146,7 +146,7 @@ int audit_watch_compare(struct audit_watch *watch, unsigned long ino, dev_t dev)
 /* Initialize a parent watch entry. */
 static struct audit_parent *audit_init_parent(struct path *path)
 {
-        struct inode *inode = path->dentry->d_inode;
+        struct inode *inode = d_backing_inode(path->dentry);
         struct audit_parent *parent;
         int ret;
 
@@ -361,11 +361,11 @@ static int audit_get_nd(struct audit_watch *watch, struct path *parent)
         struct dentry *d = kern_path_locked(watch->path, parent);
         if (IS_ERR(d))
                 return PTR_ERR(d);
-        mutex_unlock(&parent->dentry->d_inode->i_mutex);
-        if (d->d_inode) {
+        mutex_unlock(&d_backing_inode(parent->dentry)->i_mutex);
+        if (d_is_positive(d)) {
                 /* update watch filter fields */
-                watch->dev = d->d_inode->i_sb->s_dev;
-                watch->ino = d->d_inode->i_ino;
+                watch->dev = d_backing_inode(d)->i_sb->s_dev;
+                watch->ino = d_backing_inode(d)->i_ino;
         }
         dput(d);
         return 0;
@@ -426,7 +426,7 @@ int audit_add_watch(struct audit_krule *krule, struct list_head **list)
                 return ret;
 
         /* either find an old parent or attach a new one */
-        parent = audit_find_parent(parent_path.dentry->d_inode);
+        parent = audit_find_parent(d_backing_inode(parent_path.dentry));
         if (!parent) {
                 parent = audit_init_parent(&parent_path);
                 if (IS_ERR(parent)) {
@@ -482,7 +482,7 @@ static int audit_watch_handle_event(struct fsnotify_group *group,
 
         switch (data_type) {
         case (FSNOTIFY_EVENT_PATH):
-                inode = ((struct path *)data)->dentry->d_inode;
+                inode = d_backing_inode(((struct path *)data)->dentry);
                 break;
         case (FSNOTIFY_EVENT_INODE):
                 inode = (struct inode *)data;