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/jfs/file.c b/fs/jfs/file.c
index ae46788b9723..e98d39d75cf4 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -100,7 +100,7 @@ static int jfs_release(struct inode *inode, struct file *file)
 
 int jfs_setattr(struct dentry *dentry, struct iattr *iattr)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         int rc;
 
         rc = inode_change_ok(inode, iattr);
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 38fdc533f4ec..66db7bc0ed10 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -346,7 +346,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
 {
         int rc;
         tid_t tid;              /* transaction id */
-        struct inode *ip = dentry->d_inode;
+        struct inode *ip = d_inode(dentry);
         ino_t ino;
         struct component_name dname;
         struct inode *iplist[2];
@@ -472,7 +472,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
 {
         int rc;
         tid_t tid;              /* transaction id */
-        struct inode *ip = dentry->d_inode;
+        struct inode *ip = d_inode(dentry);
         ino_t ino;
         struct component_name dname;    /* object name */
         struct inode *iplist[2];
@@ -791,7 +791,7 @@ static int jfs_link(struct dentry *old_dentry,
 {
         int rc;
         tid_t tid;
-        struct inode *ip = old_dentry->d_inode;
+        struct inode *ip = d_inode(old_dentry);
         ino_t ino;
         struct component_name dname;
         struct btstack btstack;
@@ -879,7 +879,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
         struct component_name dname;
         int ssize;              /* source pathname size */
         struct btstack btstack;
-        struct inode *ip = dentry->d_inode;
+        struct inode *ip = d_inode(dentry);
         unchar *i_fastsymlink;
         s64 xlen = 0;
         int bmask = 0, xsize;
@@ -1086,8 +1086,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         dquot_initialize(old_dir);
         dquot_initialize(new_dir);
 
-        old_ip = old_dentry->d_inode;
-        new_ip = new_dentry->d_inode;
+        old_ip = d_inode(old_dentry);
+        new_ip = d_inode(new_dentry);
 
         if ((rc = get_UCSname(&old_dname, old_dentry)))
                 goto out1;
@@ -1500,9 +1500,9 @@ struct dentry *jfs_get_parent(struct dentry *dentry)
         unsigned long parent_ino;
 
         parent_ino =
-                le32_to_cpu(JFS_IP(dentry->d_inode)->i_dtroot.header.idotdot);
+                le32_to_cpu(JFS_IP(d_inode(dentry))->i_dtroot.header.idotdot);
 
-        return d_obtain_alias(jfs_iget(dentry->d_inode->i_sb, parent_ino));
+        return d_obtain_alias(jfs_iget(d_inode(dentry)->i_sb, parent_ino));
 }
 
 const struct inode_operations jfs_dir_inode_operations = {
@@ -1578,7 +1578,7 @@ static int jfs_ci_revalidate(struct dentry *dentry, unsigned int flags)
          * positive dentry isn't good idea. So it's unsupported like
          * rename("filename", "FILENAME") for now.
          */
-        if (dentry->d_inode)
+        if (d_really_is_positive(dentry))
                 return 1;
 
         /*
diff --git a/fs/jfs/symlink.c b/fs/jfs/symlink.c
index 205b946d8e0d..80f42bcc4ef1 100644
--- a/fs/jfs/symlink.c
+++ b/fs/jfs/symlink.c
@@ -24,7 +24,7 @@
 
 static void *jfs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        char *s = JFS_IP(dentry->d_inode)->i_inline;
+        char *s = JFS_IP(d_inode(dentry))->i_inline;
         nd_set_link(nd, s);
         return NULL;
 }
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 46325d5c34fc..48b15a6e5558 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -849,7 +849,7 @@ int __jfs_setxattr(tid_t tid, struct inode *inode, const char *name,
 int jfs_setxattr(struct dentry *dentry, const char *name, const void *value,
                  size_t value_len, int flags)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct jfs_inode_info *ji = JFS_IP(inode);
         int rc;
         tid_t tid;
@@ -872,7 +872,7 @@ int jfs_setxattr(struct dentry *dentry, const char *name, const void *value,
 
         tid = txBegin(inode->i_sb, 0);
         mutex_lock(&ji->commit_mutex);
-        rc = __jfs_setxattr(tid, dentry->d_inode, name, value, value_len,
+        rc = __jfs_setxattr(tid, d_inode(dentry), name, value, value_len,
                             flags);
         if (!rc)
                 rc = txCommit(tid, 1, &inode, 0);
@@ -959,7 +959,7 @@ ssize_t jfs_getxattr(struct dentry *dentry, const char *name, void *data,
                         return -EOPNOTSUPP;
         }
 
-        err = __jfs_getxattr(dentry->d_inode, name, data, buf_size);
+        err = __jfs_getxattr(d_inode(dentry), name, data, buf_size);
 
         return err;
 }
@@ -976,7 +976,7 @@ static inline int can_list(struct jfs_ea *ea)
 
 ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         char *buffer;
         ssize_t size = 0;
         int xattr_size;
@@ -1029,7 +1029,7 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
 
 int jfs_removexattr(struct dentry *dentry, const char *name)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct jfs_inode_info *ji = JFS_IP(inode);
         int rc;
         tid_t tid;
@@ -1047,7 +1047,7 @@ int jfs_removexattr(struct dentry *dentry, const char *name)
 
         tid = txBegin(inode->i_sb, 0);
         mutex_lock(&ji->commit_mutex);
-        rc = __jfs_setxattr(tid, dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
+        rc = __jfs_setxattr(tid, d_inode(dentry), name, NULL, 0, XATTR_REPLACE);
         if (!rc)
                 rc = txCommit(tid, 1, &inode, 0);
         txEnd(tid);