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>

12 files changed, 39 insertions, 39 deletions

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index a8bc47f75fa0..3ceedea099ea 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -56,7 +56,7 @@ static int ext4_sync_parent(struct inode *inode)
                 dentry = d_find_any_alias(inode);
                 if (!dentry)
                         break;
-                next = igrab(dentry->d_parent->d_inode);
+                next = igrab(d_inode(dentry->d_parent));
                 dput(dentry);
                 if (!next)
                         break;
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index ac644c31ca67..d8d4f2929cbd 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -444,7 +444,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent,
         ndirs = percpu_counter_read_positive(&sbi->s_dirs_counter);
 
         if (S_ISDIR(mode) &&
-            ((parent == sb->s_root->d_inode) ||
+            ((parent == d_inode(sb->s_root)) ||
              (ext4_test_inode_flag(parent, EXT4_INODE_TOPDIR)))) {
                 int best_ndir = inodes_per_group;
                 int ret = -1;
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 4b143febf21f..f696948c548b 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -998,7 +998,7 @@ static int ext4_add_dirent_to_inline(handle_t *handle,
                                      struct ext4_iloc *iloc,
                                      void *inline_start, int inline_size)
 {
-        struct inode    *dir = dentry->d_parent->d_inode;
+        struct inode    *dir = d_inode(dentry->d_parent);
         const char      *name = dentry->d_name.name;
         int             namelen = dentry->d_name.len;
         int             err;
@@ -1251,7 +1251,7 @@ int ext4_try_add_inline_entry(handle_t *handle, struct dentry *dentry,
         int ret, inline_size;
         void *inline_start;
         struct ext4_iloc iloc;
-        struct inode *dir = dentry->d_parent->d_inode;
+        struct inode *dir = d_inode(dentry->d_parent);
 
         ret = ext4_get_inode_loc(dir, &iloc);
         if (ret)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 42c942a950e1..063052e4aa8b 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4524,7 +4524,7 @@ static void ext4_wait_for_tail_page_commit(struct inode *inode)
  */
 int ext4_setattr(struct dentry *dentry, struct iattr *attr)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         int error, rc = 0;
         int orphan = 0;
         const unsigned int ia_valid = attr->ia_valid;
@@ -4672,7 +4672,7 @@ int ext4_getattr(struct vfsmount *mnt, struct dentry *dentry,
         struct inode *inode;
         unsigned long long delalloc_blocks;
 
-        inode = dentry->d_inode;
+        inode = d_inode(dentry);
         generic_fillattr(inode, stat);
 
         /*
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c
index 3cb267aee802..b52374e42102 100644
--- a/fs/ext4/migrate.c
+++ b/fs/ext4/migrate.c
@@ -475,7 +475,7 @@ int ext4_ext_migrate(struct inode *inode)
                 EXT4_INODES_PER_GROUP(inode->i_sb)) + 1;
         owner[0] = i_uid_read(inode);
         owner[1] = i_gid_read(inode);
-        tmp_inode = ext4_new_inode(handle, inode->i_sb->s_root->d_inode,
+        tmp_inode = ext4_new_inode(handle, d_inode(inode->i_sb->s_root),
                                    S_IFREG, NULL, goal, owner);
         if (IS_ERR(tmp_inode)) {
                 retval = PTR_ERR(tmp_inode);
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 28fe71a2904c..e086eebe335e 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1429,7 +1429,7 @@ struct dentry *ext4_get_parent(struct dentry *child)
         struct ext4_dir_entry_2 * de;
         struct buffer_head *bh;
 
-        bh = ext4_find_entry(child->d_inode, &dotdot, &de, NULL);
+        bh = ext4_find_entry(d_inode(child), &dotdot, &de, NULL);
         if (IS_ERR(bh))
                 return (struct dentry *) bh;
         if (!bh)
@@ -1437,13 +1437,13 @@ struct dentry *ext4_get_parent(struct dentry *child)
         ino = le32_to_cpu(de->inode);
         brelse(bh);
 
-        if (!ext4_valid_inum(child->d_inode->i_sb, ino)) {
-                EXT4_ERROR_INODE(child->d_inode,
+        if (!ext4_valid_inum(d_inode(child)->i_sb, ino)) {
+                EXT4_ERROR_INODE(d_inode(child),
                                  "bad parent inode number: %u", ino);
                 return ERR_PTR(-EIO);
         }
 
-        return d_obtain_alias(ext4_iget_normal(child->d_inode->i_sb, ino));
+        return d_obtain_alias(ext4_iget_normal(d_inode(child)->i_sb, ino));
 }
 
 /*
@@ -1676,7 +1676,7 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
                              struct inode *inode, struct ext4_dir_entry_2 *de,
                              struct buffer_head *bh)
 {
-        struct inode    *dir = dentry->d_parent->d_inode;
+        struct inode    *dir = d_inode(dentry->d_parent);
         const char      *name = dentry->d_name.name;
         int             namelen = dentry->d_name.len;
         unsigned int    blocksize = dir->i_sb->s_blocksize;
@@ -1732,7 +1732,7 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
 static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
                             struct inode *inode, struct buffer_head *bh)
 {
-        struct inode    *dir = dentry->d_parent->d_inode;
+        struct inode    *dir = d_inode(dentry->d_parent);
         const char      *name = dentry->d_name.name;
         int             namelen = dentry->d_name.len;
         struct buffer_head *bh2;
@@ -1864,7 +1864,7 @@ out_frames:
 static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
                           struct inode *inode)
 {
-        struct inode *dir = dentry->d_parent->d_inode;
+        struct inode *dir = d_inode(dentry->d_parent);
         struct buffer_head *bh;
         struct ext4_dir_entry_2 *de;
         struct ext4_dir_entry_tail *t;
@@ -1947,7 +1947,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry,
         struct dx_entry *entries, *at;
         struct dx_hash_info hinfo;
         struct buffer_head *bh;
-        struct inode *dir = dentry->d_parent->d_inode;
+        struct inode *dir = d_inode(dentry->d_parent);
         struct super_block *sb = dir->i_sb;
         struct ext4_dir_entry_2 *de;
         int err;
@@ -2708,7 +2708,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
         /* Initialize quotas before so that eventual writes go in
          * separate transaction */
         dquot_initialize(dir);
-        dquot_initialize(dentry->d_inode);
+        dquot_initialize(d_inode(dentry));
 
         retval = -ENOENT;
         bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
@@ -2717,7 +2717,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
         if (!bh)
                 goto end_rmdir;
 
-        inode = dentry->d_inode;
+        inode = d_inode(dentry);
 
         retval = -EIO;
         if (le32_to_cpu(de->inode) != inode->i_ino)
@@ -2777,7 +2777,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
         /* Initialize quotas before so that eventual writes go
          * in separate transaction */
         dquot_initialize(dir);
-        dquot_initialize(dentry->d_inode);
+        dquot_initialize(d_inode(dentry));
 
         retval = -ENOENT;
         bh = ext4_find_entry(dir, &dentry->d_name, &de, NULL);
@@ -2786,7 +2786,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
         if (!bh)
                 goto end_unlink;
 
-        inode = dentry->d_inode;
+        inode = d_inode(dentry);
 
         retval = -EIO;
         if (le32_to_cpu(de->inode) != inode->i_ino)
@@ -2938,7 +2938,7 @@ static int ext4_link(struct dentry *old_dentry,
                      struct inode *dir, struct dentry *dentry)
 {
         handle_t *handle;
-        struct inode *inode = old_dentry->d_inode;
+        struct inode *inode = d_inode(old_dentry);
         int err, retries = 0;
 
         if (inode->i_nlink >= EXT4_LINK_MAX)
@@ -3210,12 +3210,12 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct ext4_renament old = {
                 .dir = old_dir,
                 .dentry = old_dentry,
-                .inode = old_dentry->d_inode,
+                .inode = d_inode(old_dentry),
         };
         struct ext4_renament new = {
                 .dir = new_dir,
                 .dentry = new_dentry,
-                .inode = new_dentry->d_inode,
+                .inode = d_inode(new_dentry),
         };
         int force_reread;
         int retval;
@@ -3391,12 +3391,12 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct ext4_renament old = {
                 .dir = old_dir,
                 .dentry = old_dentry,
-                .inode = old_dentry->d_inode,
+                .inode = d_inode(old_dentry),
         };
         struct ext4_renament new = {
                 .dir = new_dir,
                 .dentry = new_dentry,
-                .inode = new_dentry->d_inode,
+                .inode = d_inode(new_dentry),
         };
         u8 new_file_type;
         int retval;
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e061e66c8280..386ba41fa17b 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1568,7 +1568,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
                         return -1;
                 }
 
-                journal_inode = path.dentry->d_inode;
+                journal_inode = d_inode(path.dentry);
                 if (!S_ISBLK(journal_inode->i_mode)) {
                         ext4_msg(sb, KERN_ERR, "error: journal path %s "
                                 "is not a block device", journal_path);
@@ -5199,7 +5199,7 @@ static int ext4_write_info(struct super_block *sb, int type)
         handle_t *handle;
 
         /* Data block + inode block */
-        handle = ext4_journal_start(sb->s_root->d_inode, EXT4_HT_QUOTA, 2);
+        handle = ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2);
         if (IS_ERR(handle))
                 return PTR_ERR(handle);
         ret = dquot_commit_info(sb, type);
@@ -5247,7 +5247,7 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id,
          * all updates to the file when we bypass pagecache...
          */
         if (EXT4_SB(sb)->s_journal &&
-            ext4_should_journal_data(path->dentry->d_inode)) {
+            ext4_should_journal_data(d_inode(path->dentry))) {
                 /*
                  * We don't need to lock updates but journal_flush() could
                  * otherwise be livelocked...
diff --git a/fs/ext4/symlink.c b/fs/ext4/symlink.c
index ff3711932018..57f50091b8d1 100644
--- a/fs/ext4/symlink.c
+++ b/fs/ext4/symlink.c
@@ -25,7 +25,7 @@
 
 static void *ext4_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        struct ext4_inode_info *ei = EXT4_I(dentry->d_inode);
+        struct ext4_inode_info *ei = EXT4_I(d_inode(dentry));
         nd_set_link(nd, (char *) ei->i_data);
         return NULL;
 }
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 1e09fc77395c..19935320f7b4 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -179,7 +179,7 @@ ext4_xattr_handler(int name_index)
 /*
  * Inode operation listxattr()
  *
- * dentry->d_inode->i_mutex: don't care
+ * d_inode(dentry)->i_mutex: don't care
  */
 ssize_t
 ext4_listxattr(struct dentry *dentry, char *buffer, size_t size)
@@ -424,7 +424,7 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
 static int
 ext4_xattr_block_list(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct buffer_head *bh = NULL;
         int error;
         struct mb_cache *ext4_mb_cache = EXT4_GET_MB_CACHE(inode);
@@ -461,7 +461,7 @@ cleanup:
 static int
 ext4_xattr_ibody_list(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct ext4_xattr_ibody_header *header;
         struct ext4_inode *raw_inode;
         struct ext4_iloc iloc;
@@ -502,7 +502,7 @@ ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
         int ret, ret2;
 
-        down_read(&EXT4_I(dentry->d_inode)->xattr_sem);
+        down_read(&EXT4_I(d_inode(dentry))->xattr_sem);
         ret = ret2 = ext4_xattr_ibody_list(dentry, buffer, buffer_size);
         if (ret < 0)
                 goto errout;
@@ -515,7 +515,7 @@ ext4_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
                 goto errout;
         ret += ret2;
 errout:
-        up_read(&EXT4_I(dentry->d_inode)->xattr_sem);
+        up_read(&EXT4_I(d_inode(dentry))->xattr_sem);
         return ret;
 }
 
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index d2a200624af5..95d90e0560f0 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -33,7 +33,7 @@ ext4_xattr_security_get(struct dentry *dentry, const char *name,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return ext4_xattr_get(dentry->d_inode, EXT4_XATTR_INDEX_SECURITY,
+        return ext4_xattr_get(d_inode(dentry), EXT4_XATTR_INDEX_SECURITY,
                               name, buffer, size);
 }
 
@@ -43,7 +43,7 @@ ext4_xattr_security_set(struct dentry *dentry, const char *name,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return ext4_xattr_set(dentry->d_inode, EXT4_XATTR_INDEX_SECURITY,
+        return ext4_xattr_set(d_inode(dentry), EXT4_XATTR_INDEX_SECURITY,
                               name, value, size, flags);
 }
 
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index 95f1f4ab59a4..891ee2ddfbd6 100644
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -36,7 +36,7 @@ ext4_xattr_trusted_get(struct dentry *dentry, const char *name, void *buffer,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return ext4_xattr_get(dentry->d_inode, EXT4_XATTR_INDEX_TRUSTED,
+        return ext4_xattr_get(d_inode(dentry), EXT4_XATTR_INDEX_TRUSTED,
                               name, buffer, size);
 }
 
@@ -46,7 +46,7 @@ ext4_xattr_trusted_set(struct dentry *dentry, const char *name,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return ext4_xattr_set(dentry->d_inode, EXT4_XATTR_INDEX_TRUSTED,
+        return ext4_xattr_set(d_inode(dentry), EXT4_XATTR_INDEX_TRUSTED,
                               name, value, size, flags);
 }
 
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index 0edb7611ffbe..6ed932b3c043 100644
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -37,7 +37,7 @@ ext4_xattr_user_get(struct dentry *dentry, const char *name,
                 return -EINVAL;
         if (!test_opt(dentry->d_sb, XATTR_USER))
                 return -EOPNOTSUPP;
-        return ext4_xattr_get(dentry->d_inode, EXT4_XATTR_INDEX_USER,
+        return ext4_xattr_get(d_inode(dentry), EXT4_XATTR_INDEX_USER,
                               name, buffer, size);
 }
 
@@ -49,7 +49,7 @@ ext4_xattr_user_set(struct dentry *dentry, const char *name,
                 return -EINVAL;
         if (!test_opt(dentry->d_sb, XATTR_USER))
                 return -EOPNOTSUPP;
-        return ext4_xattr_set(dentry->d_inode, EXT4_XATTR_INDEX_USER,
+        return ext4_xattr_set(d_inode(dentry), EXT4_XATTR_INDEX_USER,
                               name, value, size, flags);
 }