VFS: normal filesystems (and lustre): d_inode() annotations

that's the bulk of filesystem drivers dealing with inodes of their own

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

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index ffb7bd82c2a5..372100288ee5 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -250,7 +250,7 @@ int
 affs_unlink(struct inode *dir, struct dentry *dentry)
 {
         pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
-                 dentry->d_inode->i_ino, dentry);
+                 d_inode(dentry)->i_ino, dentry);
 
         return affs_remove_header(dentry);
 }
@@ -318,7 +318,7 @@ int
 affs_rmdir(struct inode *dir, struct dentry *dentry)
 {
         pr_debug("%s(dir=%lu, %lu \"%pd\")\n", __func__, dir->i_ino,
-                 dentry->d_inode->i_ino, dentry);
+                 d_inode(dentry)->i_ino, dentry);
 
         return affs_remove_header(dentry);
 }
@@ -401,7 +401,7 @@ err:
 int
 affs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry)
 {
-        struct inode *inode = old_dentry->d_inode;
+        struct inode *inode = d_inode(old_dentry);
 
         pr_debug("%s(%lu, %lu, \"%pd\")\n", __func__, inode->i_ino, dir->i_ino,
                  dentry);
@@ -428,13 +428,13 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
                 return retval;
 
         /* Unlink destination if it already exists */
-        if (new_dentry->d_inode) {
+        if (d_really_is_positive(new_dentry)) {
                 retval = affs_remove_header(new_dentry);
                 if (retval)
                         return retval;
         }
 
-        bh = affs_bread(sb, old_dentry->d_inode->i_ino);
+        bh = affs_bread(sb, d_inode(old_dentry)->i_ino);
         if (!bh)
                 return -EIO;