diff options
-rw-r--r-- | fs/sysfs/mount.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c index 1afa32ba242c..281c0c9bc39f 100644 --- a/fs/sysfs/mount.c +++ b/fs/sysfs/mount.c | |||
@@ -138,6 +138,9 @@ static void sysfs_kill_sb(struct super_block *sb) | |||
138 | { | 138 | { |
139 | struct sysfs_super_info *info = sysfs_info(sb); | 139 | struct sysfs_super_info *info = sysfs_info(sb); |
140 | 140 | ||
141 | /* Remove the superblock from fs_supers/s_instances | ||
142 | * so we can't find it, before freeing sysfs_super_info. | ||
143 | */ | ||
141 | kill_anon_super(sb); | 144 | kill_anon_super(sb); |
142 | kfree(info); | 145 | kfree(info); |
143 | } | 146 | } |
@@ -156,9 +159,11 @@ void sysfs_exit_ns(enum kobj_ns_type type, const void *ns) | |||
156 | spin_lock(&sb_lock); | 159 | spin_lock(&sb_lock); |
157 | list_for_each_entry(sb, &sysfs_fs_type.fs_supers, s_instances) { | 160 | list_for_each_entry(sb, &sysfs_fs_type.fs_supers, s_instances) { |
158 | struct sysfs_super_info *info = sysfs_info(sb); | 161 | struct sysfs_super_info *info = sysfs_info(sb); |
159 | /* Ignore superblocks that are in the process of unmounting */ | 162 | /* |
160 | if (sb->s_count <= S_BIAS) | 163 | * If we see a superblock on the fs_supers/s_instances |
161 | continue; | 164 | * list the unmount has not completed and sb->s_fs_info |
165 | * points to a valid struct sysfs_super_info. | ||
166 | */ | ||
162 | /* Ignore superblocks with the wrong ns */ | 167 | /* Ignore superblocks with the wrong ns */ |
163 | if (info->ns[type] != ns) | 168 | if (info->ns[type] != ns) |
164 | continue; | 169 | continue; |