diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-15 10:26:35 +0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 12:57:16 +0400 |
commit | 147ce69974cc1b44defa2d3d9c202ee83e2f2f3b (patch) | |
tree | 1f09480176a06d4f24d9bc98b47491fa694a0a3e /fs/proc | |
parent | 338b2f57499f37c18887182b48a499efb8a6b68f (diff) | |
download | linux-stable-147ce69974cc1b44defa2d3d9c202ee83e2f2f3b.tar.gz linux-stable-147ce69974cc1b44defa2d3d9c202ee83e2f2f3b.tar.bz2 linux-stable-147ce69974cc1b44defa2d3d9c202ee83e2f2f3b.zip |
proc_fill_cache(): kill pointless check
we'd just checked that child->d_inode is non-NULL, for fuck sake!
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 0016350ad95e..306419c19681 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1710,10 +1710,8 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx, if (!child || IS_ERR(child) || !child->d_inode) goto end_instantiate; inode = child->d_inode; - if (inode) { - ino = inode->i_ino; - type = inode->i_mode >> 12; - } + ino = inode->i_ino; + type = inode->i_mode >> 12; dput(child); end_instantiate: if (!ino) |