1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
index 25798db14553..68f03141e432 100644
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
@@ -157,10 +157,10 @@ static int dev_mkdir(const char *name, umode_t mode)
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
 
-        err = vfs_mkdir(path.dentry->d_inode, dentry, mode);
+        err = vfs_mkdir(d_inode(path.dentry), dentry, mode);
         if (!err)
                 /* mark as kernel-created inode */
-                dentry->d_inode->i_private = &thread;
+                d_inode(dentry)->i_private = &thread;
         done_path_create(&path, dentry);
         return err;
 }
@@ -207,7 +207,7 @@ static int handle_create(const char *nodename, umode_t mode, kuid_t uid,
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
 
-        err = vfs_mknod(path.dentry->d_inode, dentry, mode, dev->devt);
+        err = vfs_mknod(d_inode(path.dentry), dentry, mode, dev->devt);
         if (!err) {
                 struct iattr newattrs;
 
@@ -215,12 +215,12 @@ static int handle_create(const char *nodename, umode_t mode, kuid_t uid,
                 newattrs.ia_uid = uid;
                 newattrs.ia_gid = gid;
                 newattrs.ia_valid = ATTR_MODE|ATTR_UID|ATTR_GID;
-                mutex_lock(&dentry->d_inode->i_mutex);
+                mutex_lock(&d_inode(dentry)->i_mutex);
                 notify_change(dentry, &newattrs, NULL);
-                mutex_unlock(&dentry->d_inode->i_mutex);
+                mutex_unlock(&d_inode(dentry)->i_mutex);
 
                 /* mark as kernel-created inode */
-                dentry->d_inode->i_private = &thread;
+                d_inode(dentry)->i_private = &thread;
         }
         done_path_create(&path, dentry);
         return err;
@@ -235,16 +235,16 @@ static int dev_rmdir(const char *name)
         dentry = kern_path_locked(name, &parent);
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
-        if (dentry->d_inode) {
-                if (dentry->d_inode->i_private == &thread)
-                        err = vfs_rmdir(parent.dentry->d_inode, dentry);
+        if (d_really_is_positive(dentry)) {
+                if (d_inode(dentry)->i_private == &thread)
+                        err = vfs_rmdir(d_inode(parent.dentry), dentry);
                 else
                         err = -EPERM;
         } else {
                 err = -ENOENT;
         }
         dput(dentry);
-        mutex_unlock(&parent.dentry->d_inode->i_mutex);
+        mutex_unlock(&d_inode(parent.dentry)->i_mutex);
         path_put(&parent);
         return err;
 }
@@ -306,11 +306,11 @@ static int handle_remove(const char *nodename, struct device *dev)
         if (IS_ERR(dentry))
                 return PTR_ERR(dentry);
 
-        if (dentry->d_inode) {
+        if (d_really_is_positive(dentry)) {
                 struct kstat stat;
                 struct path p = {.mnt = parent.mnt, .dentry = dentry};
                 err = vfs_getattr(&p, &stat);
-                if (!err && dev_mynode(dev, dentry->d_inode, &stat)) {
+                if (!err && dev_mynode(dev, d_inode(dentry), &stat)) {
                         struct iattr newattrs;
                         /*
                          * before unlinking this node, reset permissions
@@ -321,10 +321,10 @@ static int handle_remove(const char *nodename, struct device *dev)
                         newattrs.ia_mode = stat.mode & ~0777;
                         newattrs.ia_valid =
                                 ATTR_UID|ATTR_GID|ATTR_MODE;
-                        mutex_lock(&dentry->d_inode->i_mutex);
+                        mutex_lock(&d_inode(dentry)->i_mutex);
                         notify_change(dentry, &newattrs, NULL);
-                        mutex_unlock(&dentry->d_inode->i_mutex);
-                        err = vfs_unlink(parent.dentry->d_inode, dentry, NULL);
+                        mutex_unlock(&d_inode(dentry)->i_mutex);
+                        err = vfs_unlink(d_inode(parent.dentry), dentry, NULL);
                         if (!err || err == -ENOENT)
                                 deleted = 1;
                 }
@@ -332,7 +332,7 @@ static int handle_remove(const char *nodename, struct device *dev)
                 err = -ENOENT;
         }
         dput(dentry);
-        mutex_unlock(&parent.dentry->d_inode->i_mutex);
+        mutex_unlock(&d_inode(parent.dentry)->i_mutex);
 
         path_put(&parent);
         if (deleted && strchr(nodename, '/'))