dentry_kill() doesn't need the second argument now (8cbf74da) · Commits · 戴 / test

fs/dcache.c

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -500,8 +500,7 @@ static void __dentry_kill(struct dentry *dentry)
	* If ref is non-zero, then decrement the refcount too.		* If ref is non-zero, then decrement the refcount too.
	* Returns dentry requiring refcount drop, or NULL if we're done.		* Returns dentry requiring refcount drop, or NULL if we're done.
	*/		*/
	static struct dentry *		static struct dentry dentry_kill(struct dentry dentry)
	dentry_kill(struct dentry *dentry, int unlock_on_failure)
	__releases(dentry->d_lock)		__releases(dentry->d_lock)
	{		{
	struct inode *inode = dentry->d_inode;		struct inode *inode = dentry->d_inode;
	@@ -523,10 +522,8 @@ dentry_kill(struct dentry *dentry, int unlock_on_failure)
	return parent;		return parent;

	failed:		failed:
	if (unlock_on_failure) {
	spin_unlock(&dentry->d_lock);		spin_unlock(&dentry->d_lock);
	cpu_relax();		cpu_relax();
	}
	return dentry; /* try again with same dentry */		return dentry; /* try again with same dentry */
	}		}

	@@ -615,7 +612,7 @@ repeat:
	return;		return;

	kill_it:		kill_it:
	dentry = dentry_kill(dentry, 1);		dentry = dentry_kill(dentry);
	if (dentry)		if (dentry)
	goto repeat;		goto repeat;
	}		}