summaryrefslogtreecommitdiff
path: root/fs/proc/root.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.com>2026-02-09 17:33:26 +0100
committerJiri Kosina <jkosina@suse.com>2026-02-09 17:33:26 +0100
commitec496f77b4c11036cc835d6f045fb5e5ef1e6530 (patch)
treee0f5a8f9ffec9de060b7b617514daecc8bdaca6d /fs/proc/root.c
parent984d6f361d19486fcd8fc13d29112fe73123f482 (diff)
parentae40ace015be442837934c5028a8eba7fe3cd98f (diff)
downloadlinux-next-ec496f77b4c11036cc835d6f045fb5e5ef1e6530.tar.gz
linux-next-ec496f77b4c11036cc835d6f045fb5e5ef1e6530.zip
Merge branch 'for-6.20/sony' into for-linus
- Support for Rock band 4 PS4 and PS5 guitars (Rosalie Wanders)
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r--fs/proc/root.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c
index 1e24e085c7d5..d8ca41d823e4 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -347,17 +347,11 @@ static void proc_kill_sb(struct super_block *sb)
{
struct proc_fs_info *fs_info = proc_sb_info(sb);
- if (!fs_info) {
- kill_anon_super(sb);
- return;
- }
-
- dput(fs_info->proc_self);
- dput(fs_info->proc_thread_self);
-
kill_anon_super(sb);
- put_pid_ns(fs_info->pid_ns);
- kfree_rcu(fs_info, rcu);
+ if (fs_info) {
+ put_pid_ns(fs_info->pid_ns);
+ kfree_rcu(fs_info, rcu);
+ }
}
static struct file_system_type proc_fs_type = {