8 files changed, 31 insertions, 31 deletions

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index f21b6fb5e4c4..1ba5c97943b8 100644
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -224,14 +224,14 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(dir_i->i_sb);
         struct jffs2_inode_info *dir_f = JFFS2_INODE_INFO(dir_i);
-        struct jffs2_inode_info *dead_f = JFFS2_INODE_INFO(dentry->d_inode);
+        struct jffs2_inode_info *dead_f = JFFS2_INODE_INFO(d_inode(dentry));
         int ret;
         uint32_t now = get_seconds();
 
         ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
                               dentry->d_name.len, dead_f, now);
         if (dead_f->inocache)
-                set_nlink(dentry->d_inode, dead_f->inocache->pino_nlink);
+                set_nlink(d_inode(dentry), dead_f->inocache->pino_nlink);
         if (!ret)
                 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
         return ret;
@@ -241,8 +241,8 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
 
 static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct dentry *dentry)
 {
-        struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dentry->d_inode->i_sb);
-        struct jffs2_inode_info *f = JFFS2_INODE_INFO(old_dentry->d_inode);
+        struct jffs2_sb_info *c = JFFS2_SB_INFO(d_inode(old_dentry)->i_sb);
+        struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(old_dentry));
         struct jffs2_inode_info *dir_f = JFFS2_INODE_INFO(dir_i);
         int ret;
         uint8_t type;
@@ -256,7 +256,7 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
                 return -EPERM;
 
         /* XXX: This is ugly */
-        type = (old_dentry->d_inode->i_mode & S_IFMT) >> 12;
+        type = (d_inode(old_dentry)->i_mode & S_IFMT) >> 12;
         if (!type) type = DT_REG;
 
         now = get_seconds();
@@ -264,11 +264,11 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
 
         if (!ret) {
                 mutex_lock(&f->sem);
-                set_nlink(old_dentry->d_inode, ++f->inocache->pino_nlink);
+                set_nlink(d_inode(old_dentry), ++f->inocache->pino_nlink);
                 mutex_unlock(&f->sem);
-                d_instantiate(dentry, old_dentry->d_inode);
+                d_instantiate(dentry, d_inode(old_dentry));
                 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
-                ihold(old_dentry->d_inode);
+                ihold(d_inode(old_dentry));
         }
         return ret;
 }
@@ -585,7 +585,7 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
 {
         struct jffs2_sb_info *c = JFFS2_SB_INFO(dir_i->i_sb);
         struct jffs2_inode_info *dir_f = JFFS2_INODE_INFO(dir_i);
-        struct jffs2_inode_info *f = JFFS2_INODE_INFO(dentry->d_inode);
+        struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(dentry));
         struct jffs2_full_dirent *fd;
         int ret;
         uint32_t now = get_seconds();
@@ -599,7 +599,7 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
                               dentry->d_name.len, f, now);
         if (!ret) {
                 dir_i->i_mtime = dir_i->i_ctime = ITIME(now);
-                clear_nlink(dentry->d_inode);
+                clear_nlink(d_inode(dentry));
                 drop_nlink(dir_i);
         }
         return ret;
@@ -770,8 +770,8 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
          * the VFS can't check whether the victim is empty. The filesystem
          * needs to do that for itself.
          */
-        if (new_dentry->d_inode) {
-                victim_f = JFFS2_INODE_INFO(new_dentry->d_inode);
+        if (d_really_is_positive(new_dentry)) {
+                victim_f = JFFS2_INODE_INFO(d_inode(new_dentry));
                 if (d_is_dir(new_dentry)) {
                         struct jffs2_full_dirent *fd;
 
@@ -794,12 +794,12 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
         /* Make a hard link */
 
         /* XXX: This is ugly */
-        type = (old_dentry->d_inode->i_mode & S_IFMT) >> 12;
+        type = (d_inode(old_dentry)->i_mode & S_IFMT) >> 12;
         if (!type) type = DT_REG;
 
         now = get_seconds();
         ret = jffs2_do_link(c, JFFS2_INODE_INFO(new_dir_i),
-                            old_dentry->d_inode->i_ino, type,
+                            d_inode(old_dentry)->i_ino, type,
                             new_dentry->d_name.name, new_dentry->d_name.len, now);
 
         if (ret)
@@ -808,9 +808,9 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
         if (victim_f) {
                 /* There was a victim. Kill it off nicely */
                 if (d_is_dir(new_dentry))
-                        clear_nlink(new_dentry->d_inode);
+                        clear_nlink(d_inode(new_dentry));
                 else
-                        drop_nlink(new_dentry->d_inode);
+                        drop_nlink(d_inode(new_dentry));
                 /* Don't oops if the victim was a dirent pointing to an
                    inode which didn't exist. */
                 if (victim_f->inocache) {
@@ -836,9 +836,9 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
 
         if (ret) {
                 /* Oh shit. We really ought to make a single node which can do both atomically */
-                struct jffs2_inode_info *f = JFFS2_INODE_INFO(old_dentry->d_inode);
+                struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(old_dentry));
                 mutex_lock(&f->sem);
-                inc_nlink(old_dentry->d_inode);
+                inc_nlink(d_inode(old_dentry));
                 if (f->inocache && !d_is_dir(old_dentry))
                         f->inocache->pino_nlink++;
                 mutex_unlock(&f->sem);
@@ -846,8 +846,8 @@ static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry,
                 pr_notice("%s(): Link succeeded, unlink failed (err %d). You now have a hard link\n",
                           __func__, ret);
                 /* Might as well let the VFS know */
-                d_instantiate(new_dentry, old_dentry->d_inode);
-                ihold(old_dentry->d_inode);
+                d_instantiate(new_dentry, d_inode(old_dentry));
+                ihold(d_inode(old_dentry));
                 new_dir_i->i_mtime = new_dir_i->i_ctime = ITIME(now);
                 return ret;
         }
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 601afd1afddf..fe5ea080b4ec 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -190,7 +190,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
 
 int jffs2_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/jffs2/security.c b/fs/jffs2/security.c
index aca97f35b292..d4b43fb7adb1 100644
--- a/fs/jffs2/security.c
+++ b/fs/jffs2/security.c
@@ -54,7 +54,7 @@ static int jffs2_security_getxattr(struct dentry *dentry, const char *name,
         if (!strcmp(name, ""))
                 return -EINVAL;
 
-        return do_jffs2_getxattr(dentry->d_inode, JFFS2_XPREFIX_SECURITY,
+        return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_SECURITY,
                                  name, buffer, size);
 }
 
@@ -64,7 +64,7 @@ static int jffs2_security_setxattr(struct dentry *dentry, const char *name,
         if (!strcmp(name, ""))
                 return -EINVAL;
 
-        return do_jffs2_setxattr(dentry->d_inode, JFFS2_XPREFIX_SECURITY,
+        return do_jffs2_setxattr(d_inode(dentry), JFFS2_XPREFIX_SECURITY,
                                  name, buffer, size, flags);
 }
 
diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c
index 3d76f28a2ba9..d86c5e3176a1 100644
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
@@ -140,14 +140,14 @@ static struct dentry *jffs2_get_parent(struct dentry *child)
 
         BUG_ON(!d_is_dir(child));
 
-        f = JFFS2_INODE_INFO(child->d_inode);
+        f = JFFS2_INODE_INFO(d_inode(child));
 
         pino = f->inocache->pino_nlink;
 
         JFFS2_DEBUG("Parent of directory ino #%u is #%u\n",
                     f->inocache->ino, pino);
 
-        return d_obtain_alias(jffs2_iget(child->d_inode->i_sb, pino));
+        return d_obtain_alias(jffs2_iget(d_inode(child)->i_sb, pino));
 }
 
 static const struct export_operations jffs2_export_ops = {
diff --git a/fs/jffs2/symlink.c b/fs/jffs2/symlink.c
index c7c77b0dfccd..1fefa25d0fa5 100644
--- a/fs/jffs2/symlink.c
+++ b/fs/jffs2/symlink.c
@@ -31,7 +31,7 @@ const struct inode_operations jffs2_symlink_inode_operations =
 
 static void *jffs2_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        struct jffs2_inode_info *f = JFFS2_INODE_INFO(dentry->d_inode);
+        struct jffs2_inode_info *f = JFFS2_INODE_INFO(d_inode(dentry));
         char *p = (char *)f->target;
 
         /*
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index d72817ac51f6..c4dd342d13a7 100644
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -960,7 +960,7 @@ static const struct xattr_handler *xprefix_to_handler(int xprefix) {
 
 ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
         struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
         struct jffs2_inode_cache *ic = f->inocache;
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c
index 1c868194c504..ceaf9c693225 100644
--- a/fs/jffs2/xattr_trusted.c
+++ b/fs/jffs2/xattr_trusted.c
@@ -21,7 +21,7 @@ static int jffs2_trusted_getxattr(struct dentry *dentry, const char *name,
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
-        return do_jffs2_getxattr(dentry->d_inode, JFFS2_XPREFIX_TRUSTED,
+        return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_TRUSTED,
                                  name, buffer, size);
 }
 
@@ -30,7 +30,7 @@ static int jffs2_trusted_setxattr(struct dentry *dentry, const char *name,
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
-        return do_jffs2_setxattr(dentry->d_inode, JFFS2_XPREFIX_TRUSTED,
+        return do_jffs2_setxattr(d_inode(dentry), JFFS2_XPREFIX_TRUSTED,
                                  name, buffer, size, flags);
 }
 
diff --git a/fs/jffs2/xattr_user.c b/fs/jffs2/xattr_user.c
index 916b5c966039..a71391eba514 100644
--- a/fs/jffs2/xattr_user.c
+++ b/fs/jffs2/xattr_user.c
@@ -21,7 +21,7 @@ static int jffs2_user_getxattr(struct dentry *dentry, const char *name,
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
-        return do_jffs2_getxattr(dentry->d_inode, JFFS2_XPREFIX_USER,
+        return do_jffs2_getxattr(d_inode(dentry), JFFS2_XPREFIX_USER,
                                  name, buffer, size);
 }
 
@@ -30,7 +30,7 @@ static int jffs2_user_setxattr(struct dentry *dentry, const char *name,
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
-        return do_jffs2_setxattr(dentry->d_inode, JFFS2_XPREFIX_USER,
+        return do_jffs2_setxattr(d_inode(dentry), JFFS2_XPREFIX_USER,
                                  name, buffer, size, flags);
 }