mirror of
https://github.com/torvalds/linux.git
synced 2026-05-25 07:33:19 +02:00
Fix a braino in d_revalidate series
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQqUNBr3gm4hGXdBJlZ7Krx/gZQ6wUCZ6Ey3AAKCRBZ7Krx/gZQ 61CzAP9fn68btv0R7pFJjbw5yAnrQHRDJ1i7PjI2NKLz05AwnQD/eD5oNakTbqMd LRCNb1awaEaEwnv4kf4vHEi9ykBEXQE= =0QhL -----END PGP SIGNATURE----- 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"
This commit is contained in:
commit
0de63bb7d9
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user