diff --git a/[refs] b/[refs] index 95696a0b8b67..7aec7b325ee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2903ff019b346ab8d36ebbf54853c3aaf6590608 +refs/heads/master: 1fe0c0230a7c2d5f4061e681a3f3be9512446d23 diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 16521a9f2038..fbee67b92651 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -2109,7 +2109,7 @@ void d_delete(struct dentry * dentry) inode = dentry->d_inode; isdir = S_ISDIR(inode->i_mode); if (dentry->d_count == 1) { - if (inode && !spin_trylock(&inode->i_lock)) { + if (!spin_trylock(&inode->i_lock)) { spin_unlock(&dentry->d_lock); cpu_relax(); goto again;