Commit 0de63bb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull d_revalidate fix from Al Viro:
 "Fix a braino in d_revalidate series: check ->d_op for NULL"

* tag 'pull-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix braino in "9p: fix ->rename_sem exclusion"
parents f286757b 902e09c8

fs/dcache.c

+2 −2
Original line number Diff line number Diff line
@@ -2966,11 +2966,11 @@ static int __d_unalias(struct dentry *dentry, struct dentry *alias) 
		goto out_err;

	m2 = &alias->d_parent->d_inode->i_rwsem;

out_unalias:

	if (alias->d_op->d_unalias_trylock &&

	if (alias->d_op && alias->d_op->d_unalias_trylock &&

	    !alias->d_op->d_unalias_trylock(alias))

		goto out_err;

	__d_move(alias, dentry, false);

	if (alias->d_op->d_unalias_unlock)

	if (alias->d_op && alias->d_op->d_unalias_unlock)

		alias->d_op->d_unalias_unlock(alias);

	ret = 0;

out_err: