diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-03 13:39:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-03 13:39:55 -0800 |
| commit | 0de63bb7d91975e73338300a57c54b93d3cc151c (patch) | |
| tree | d392e5bd969e7cbbda83f88c14ef354e22e35e18 /fs/dcache.c | |
| parent | f286757b644c226b6b31779da95a4fa7ab245ef5 (diff) | |
| parent | 902e09c8acde117b00369521f54df817a983d4ab (diff) | |
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"
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 9cc0d47da321..96b21a47312e 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -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: |