Skip to content

Commit 0de63bb

Browse files
committed
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"
2 parents f286757 + 902e09c commit 0de63bb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/dcache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2966,11 +2966,11 @@ static int __d_unalias(struct dentry *dentry, struct dentry *alias)
29662966
goto out_err;
29672967
m2 = &alias->d_parent->d_inode->i_rwsem;
29682968
out_unalias:
2969-
if (alias->d_op->d_unalias_trylock &&
2969+
if (alias->d_op && alias->d_op->d_unalias_trylock &&
29702970
!alias->d_op->d_unalias_trylock(alias))
29712971
goto out_err;
29722972
__d_move(alias, dentry, false);
2973-
if (alias->d_op->d_unalias_unlock)
2973+
if (alias->d_op && alias->d_op->d_unalias_unlock)
29742974
alias->d_op->d_unalias_unlock(alias);
29752975
ret = 0;
29762976
out_err:

0 commit comments

Comments
 (0)