diff --git a/[refs] b/[refs] index 2e55c80608dc..629f19106e69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3a065e3f13da8a3470ed09c7f38aad256083726 +refs/heads/master: cb59861f03a626196a23fdef5e20ddbb8cca6466 diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c index d2783c8a770b..dad4b80257db 100644 --- a/trunk/fs/namei.c +++ b/trunk/fs/namei.c @@ -1764,7 +1764,7 @@ struct file *do_filp_open(int dfd, const char *pathname, path_to_nameidata(&path, &nd); error = -EISDIR; - if (path.dentry->d_inode && S_ISDIR(path.dentry->d_inode->i_mode)) + if (S_ISDIR(path.dentry->d_inode->i_mode)) goto exit; ok: /*