4 files changed, 16 insertions, 16 deletions

diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 0fa6c803992e..20ae94d37acd 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -498,7 +498,7 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir,
                       struct dentry *dentry)
 {
         struct ubifs_info *c = dir->i_sb->s_fs_info;
-        struct inode *inode = old_dentry->d_inode;
+        struct inode *inode = d_inode(old_dentry);
         struct ubifs_inode *ui = ubifs_inode(inode);
         struct ubifs_inode *dir_ui = ubifs_inode(dir);
         int err, sz_change = CALC_DENT_SIZE(dentry->d_name.len);
@@ -553,7 +553,7 @@ out_cancel:
 static int ubifs_unlink(struct inode *dir, struct dentry *dentry)
 {
         struct ubifs_info *c = dir->i_sb->s_fs_info;
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct ubifs_inode *dir_ui = ubifs_inode(dir);
         int sz_change = CALC_DENT_SIZE(dentry->d_name.len);
         int err, budgeted = 1;
@@ -645,7 +645,7 @@ static int check_dir_empty(struct ubifs_info *c, struct inode *dir)
 static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
 {
         struct ubifs_info *c = dir->i_sb->s_fs_info;
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         int sz_change = CALC_DENT_SIZE(dentry->d_name.len);
         int err, budgeted = 1;
         struct ubifs_inode *dir_ui = ubifs_inode(dir);
@@ -661,7 +661,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry *dentry)
                 inode->i_ino, dir->i_ino);
         ubifs_assert(mutex_is_locked(&dir->i_mutex));
         ubifs_assert(mutex_is_locked(&inode->i_mutex));
-        err = check_dir_empty(c, dentry->d_inode);
+        err = check_dir_empty(c, d_inode(dentry));
         if (err)
                 return err;
 
@@ -967,8 +967,8 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         struct inode *new_dir, struct dentry *new_dentry)
 {
         struct ubifs_info *c = old_dir->i_sb->s_fs_info;
-        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 ubifs_inode *old_inode_ui = ubifs_inode(old_inode);
         int err, release, sync = 0, move = (new_dir != old_dir);
         int is_dir = S_ISDIR(old_inode->i_mode);
@@ -1133,7 +1133,7 @@ int ubifs_getattr(struct vfsmount *mnt, struct dentry *dentry,
                   struct kstat *stat)
 {
         loff_t size;
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct ubifs_inode *ui = ubifs_inode(inode);
 
         mutex_lock(&ui->ui_mutex);
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 475b15635f11..b5c69414e694 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1256,7 +1256,7 @@ static int do_setattr(struct ubifs_info *c, struct inode *inode,
 int ubifs_setattr(struct dentry *dentry, struct iattr *attr)
 {
         int err;
-        struct inode *inode = dentry->d_inode;
+        struct inode *inode = d_inode(dentry);
         struct ubifs_info *c = inode->i_sb->s_fs_info;
 
         dbg_gen("ino %lu, mode %#x, ia_valid %#x",
@@ -1301,7 +1301,7 @@ static void ubifs_invalidatepage(struct page *page, unsigned int offset,
 
 static void *ubifs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        struct ubifs_inode *ui = ubifs_inode(dentry->d_inode);
+        struct ubifs_inode *ui = ubifs_inode(d_inode(dentry));
 
         nd_set_link(nd, ui->data);
         return NULL;
diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c
index f6ac3f29323c..4f657e15c46e 100644
--- a/fs/ubifs/journal.c
+++ b/fs/ubifs/journal.c
@@ -930,8 +930,8 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir,
         union ubifs_key key;
         struct ubifs_dent_node *dent, *dent2;
         int err, dlen1, dlen2, ilen, lnum, offs, len;
-        const struct inode *old_inode = old_dentry->d_inode;
-        const struct inode *new_inode = new_dentry->d_inode;
+        const struct inode *old_inode = d_inode(old_dentry);
+        const struct inode *new_inode = d_inode(new_dentry);
         int aligned_dlen1, aligned_dlen2, plen = UBIFS_INO_NODE_SZ;
         int last_reference = !!(new_inode && new_inode->i_nlink == 0);
         int move = (old_dir != new_dir);
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index a92be244a6fb..dd2d872189da 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -364,15 +364,15 @@ int ubifs_setxattr(struct dentry *dentry, const char *name,
                    const void *value, size_t size, int flags)
 {
         dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd",
-                name, dentry->d_inode->i_ino, dentry, size);
+                name, d_inode(dentry)->i_ino, dentry, size);
 
-        return setxattr(dentry->d_inode, name, value, size, flags);
+        return setxattr(d_inode(dentry), name, value, size, flags);
 }
 
 ssize_t ubifs_getxattr(struct dentry *dentry, const char *name, void *buf,
                        size_t size)
 {
-        struct inode *inode, *host = dentry->d_inode;
+        struct inode *inode, *host = d_inode(dentry);
         struct ubifs_info *c = host->i_sb->s_fs_info;
         struct qstr nm = QSTR_INIT(name, strlen(name));
         struct ubifs_inode *ui;
@@ -432,7 +432,7 @@ out_unlock:
 ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
         union ubifs_key key;
-        struct inode *host = dentry->d_inode;
+        struct inode *host = d_inode(dentry);
         struct ubifs_info *c = host->i_sb->s_fs_info;
         struct ubifs_inode *host_ui = ubifs_inode(host);
         struct ubifs_dent_node *xent, *pxent = NULL;
@@ -535,7 +535,7 @@ out_cancel:
 
 int ubifs_removexattr(struct dentry *dentry, const char *name)
 {
-        struct inode *inode, *host = dentry->d_inode;
+        struct inode *inode, *host = d_inode(dentry);
         struct ubifs_info *c = host->i_sb->s_fs_info;
         struct qstr nm = QSTR_INIT(name, strlen(name));
         struct ubifs_dent_node *xent;