diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
| commit | b5bc8ac25aa1477fee3853718f2673a594efdc4b (patch) | |
| tree | dcee1a7ae080d573c12a4a0411b9417746ffd343 /fs/kernfs | |
| parent | dyndbg: fix spurious vNpr_info change (diff) | |
| parent | Linux 5.15-rc6 (diff) | |
| download | linux-dev-b5bc8ac25aa1477fee3853718f2673a594efdc4b.tar.xz linux-dev-b5bc8ac25aa1477fee3853718f2673a594efdc4b.zip | |
Merge 5.15-rc6 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/kernfs')
| -rw-r--r-- | fs/kernfs/dir.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index cfc3ce8b815a..8e0a1378a4b1 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1111,7 +1111,14 @@ static struct dentry *kernfs_iop_lookup(struct inode *dir, kn = kernfs_find_ns(parent, dentry->d_name.name, ns); /* attach dentry and inode */ - if (kn && kernfs_active(kn)) { + if (kn) { + /* Inactive nodes are invisible to the VFS so don't + * create a negative. + */ + if (!kernfs_active(kn)) { + up_read(&kernfs_rwsem); + return NULL; + } inode = kernfs_get_inode(dir->i_sb, kn); if (!inode) inode = ERR_PTR(-ENOMEM); |