openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vfs: delete surplus inode NULL check 

Each iteration of d_delete we reload inode from dentry->d_inode and
then call S_ISDIR(inode-i_mode), so inode cannot possibly be NULL
shortly afterwards unless something went horribly wrong.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Alan Cox 2012-09-19 15:49:51 +01:00 committed by Al Viro
parent 2903ff019b
commit 1fe0c0230a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/dcache.c
View File

@ -2109,7 +2109,7 @@ void d_delete(struct dentry * dentry)
inode = dentry->d_inode; inode = dentry->d_inode;
isdir = S_ISDIR(inode->i_mode); isdir = S_ISDIR(inode->i_mode);
if (dentry->d_count == 1) { if (dentry->d_count == 1) {
if (inode && !spin_trylock(&inode->i_lock)) { if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
cpu_relax(); cpu_relax();
goto again; goto again;