* If ref is non-zero, then decrement the refcount too.
  * Returns dentry requiring refcount drop, or NULL if we're done.
  */
-static struct dentry *
-dentry_kill(struct dentry *dentry, int unlock_on_failure)
+static struct dentry *dentry_kill(struct dentry *dentry)
        __releases(dentry->d_lock)
 {
        struct inode *inode = dentry->d_inode;
        return parent;
 
 failed:
-       if (unlock_on_failure) {
-               spin_unlock(&dentry->d_lock);
-               cpu_relax();
-       }
+       spin_unlock(&dentry->d_lock);
+       cpu_relax();
        return dentry; /* try again with same dentry */
 }
 
        return;
 
 kill_it:
-       dentry = dentry_kill(dentry, 1);
+       dentry = dentry_kill(dentry);
        if (dentry)
                goto repeat;
 }