Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / fs / namei.c

diff --git a/fs/namei.c b/fs/namei.c
index 76fb76a0818bc274fc67b2d87b582db6690d62a6..ffab2e06e1472eca41449cbe5d8fe22baa219d29 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1585,7 +1585,7 @@ static inline int walk_component(struct nameidata *nd, struct path *path,
                inode = path->dentry->d_inode;
        }
        err = -ENOENT;
-       if (!inode || d_is_negative(path->dentry))
+       if (d_is_negative(path->dentry))
                goto out_path_put;
 
        if (should_follow_link(path->dentry, follow)) {
@@ -2310,7 +2310,7 @@ mountpoint_last(struct nameidata *nd, struct path *path)
        mutex_unlock(&dir->d_inode->i_mutex);
 
 done:
-       if (!dentry->d_inode || d_is_negative(dentry)) {
+       if (d_is_negative(dentry)) {
                error = -ENOENT;
                dput(dentry);
                goto out;
@@ -3038,7 +3038,7 @@ retry_lookup:
 finish_lookup:
        /* we _can_ be in RCU mode here */
        error = -ENOENT;
-       if (!inode || d_is_negative(path->dentry)) {
+       if (d_is_negative(path->dentry)) {
                path_to_nameidata(path, nd);
                goto out;
        }
@@ -3077,7 +3077,7 @@ finish_open:
        error = -ENOTDIR;
        if ((nd->flags & LOOKUP_DIRECTORY) && !d_can_lookup(nd->path.dentry))
                goto out;
-       if (!S_ISREG(nd->inode->i_mode))
+       if (!d_is_reg(nd->path.dentry))
                will_truncate = false;
 
        if (will_truncate) {