summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2009-11-16 12:05:20 -0800
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-17 10:52:34 -0500
commitcb59861f03a626196a23fdef5e20ddbb8cca6466 (patch)
tree777dda2c1764e74cf6e7e5bda27314bb99c5b4d1 /fs
parenta3a065e3f13da8a3470ed09c7f38aad256083726 (diff)
downloadlinux-3.10-cb59861f03a626196a23fdef5e20ddbb8cca6466.tar.gz
linux-3.10-cb59861f03a626196a23fdef5e20ddbb8cca6466.tar.bz2
linux-3.10-cb59861f03a626196a23fdef5e20ddbb8cca6466.zip
vfs: remove extraneous NULL d_inode check from do_filp_open
We can't get to this point unless it's a valid pointer. Signed-off-by: Jeff Layton <jlayton@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c
index d2783c8a770..dad4b80257d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1764,7 +1764,7 @@ do_last:
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:
/*