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>

4 files changed, 17 insertions, 17 deletions

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 7fa3313ab0e2..02e4ab3e7d4d 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1391,7 +1391,7 @@ bool f2fs_empty_dir(struct inode *);
 
 static inline int f2fs_add_link(struct dentry *dentry, struct inode *inode)
 {
-        return __f2fs_add_link(dentry->d_parent->d_inode, &dentry->d_name,
+        return __f2fs_add_link(d_inode(dentry->d_parent), &dentry->d_name,
                                 inode);
 }
 
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index df6a0596eccf..71a74f1e2bfb 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -562,7 +562,7 @@ void f2fs_truncate(struct inode *inode)
 int f2fs_getattr(struct vfsmount *mnt,
                          struct dentry *dentry, struct kstat *stat)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         generic_fillattr(inode, stat);
         stat->blocks <<= 3;
         return 0;
@@ -601,7 +601,7 @@ static void __setattr_copy(struct inode *inode, const struct iattr *attr)
 
 int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct f2fs_inode_info *fi = F2FS_I(inode);
         int err;
 
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index e79639a9787a..ed7404706ca4 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -150,7 +150,7 @@ out:
 static int f2fs_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);
         struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
         int err;
 
@@ -181,10 +181,10 @@ out:
 struct dentry *f2fs_get_parent(struct dentry *child)
 {
         struct qstr dotdot = QSTR_INIT("..", 2);
-        unsigned long ino = f2fs_inode_by_name(child->d_inode, &dotdot);
+        unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot);
         if (!ino)
                 return ERR_PTR(-ENOENT);
-        return d_obtain_alias(f2fs_iget(child->d_inode->i_sb, ino));
+        return d_obtain_alias(f2fs_iget(d_inode(child)->i_sb, ino));
 }
 
 static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
@@ -214,7 +214,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
 static int f2fs_unlink(struct inode *dir, struct dentry *dentry)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct f2fs_dir_entry *de;
         struct page *page;
         int err = -ENOENT;
@@ -326,7 +326,7 @@ out_fail:
 
 static int f2fs_rmdir(struct inode *dir, struct dentry *dentry)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         if (f2fs_empty_dir(inode))
                 return f2fs_unlink(dir, dentry);
         return -ENOTEMPTY;
@@ -374,8 +374,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         struct inode *new_dir, struct dentry *new_dentry)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(old_dir);
-        struct inode *old_inode = old_dentry->d_inode;
-        struct inode *new_inode = new_dentry->d_inode;
+        struct inode *old_inode = d_inode(old_dentry);
+        struct inode *new_inode = d_inode(new_dentry);
         struct page *old_dir_page;
         struct page *old_page, *new_page;
         struct f2fs_dir_entry *old_dir_entry = NULL;
@@ -501,8 +501,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
                              struct inode *new_dir, struct dentry *new_dentry)
 {
         struct f2fs_sb_info *sbi = F2FS_I_SB(old_dir);
-        struct inode *old_inode = old_dentry->d_inode;
-        struct inode *new_inode = new_dentry->d_inode;
+        struct inode *old_inode = d_inode(old_dentry);
+        struct inode *new_inode = d_inode(new_dentry);
         struct page *old_dir_page, *new_dir_page;
         struct page *old_page, *new_page;
         struct f2fs_dir_entry *old_dir_entry = NULL, *new_dir_entry = NULL;
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 5072bf9ae0ef..62c82f35087e 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -83,7 +83,7 @@ static int f2fs_xattr_generic_get(struct dentry *dentry, const char *name,
         }
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return f2fs_getxattr(dentry->d_inode, type, name, buffer, size, NULL);
+        return f2fs_getxattr(d_inode(dentry), type, name, buffer, size, NULL);
 }
 
 static int f2fs_xattr_generic_set(struct dentry *dentry, const char *name,
@@ -108,7 +108,7 @@ static int f2fs_xattr_generic_set(struct dentry *dentry, const char *name,
         if (strcmp(name, "") == 0)
                 return -EINVAL;
 
-        return f2fs_setxattr(dentry->d_inode, type, name,
+        return f2fs_setxattr(d_inode(dentry), type, name,
                                         value, size, NULL, flags);
 }
 
@@ -130,7 +130,7 @@ static size_t f2fs_xattr_advise_list(struct dentry *dentry, char *list,
 static int f2fs_xattr_advise_get(struct dentry *dentry, const char *name,
                 void *buffer, size_t size, int type)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
 
         if (strcmp(name, "") != 0)
                 return -EINVAL;
@@ -142,7 +142,7 @@ static int f2fs_xattr_advise_get(struct dentry *dentry, const char *name,
 static int f2fs_xattr_advise_set(struct dentry *dentry, const char *name,
                 const void *value, size_t size, int flags, int type)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
 
         if (strcmp(name, "") != 0)
                 return -EINVAL;
@@ -442,7 +442,7 @@ cleanup:
 
 ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct f2fs_xattr_entry *entry;
         void *base_addr;
         int error = 0;