leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fuse: check s_root when destroying sb

Browse Source 
Checking "fm" works because currently sb->s_fs_info is cleared on error
paths; however, sb->s_root is what generic_shutdown_super() checks to
determine whether the sb was fully initialized or not.

This change will allow cleanup of sb setup error paths.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi
2021-10-21 10:01:38 +02:00
parent 519d81956e
commit d534d31d6a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fuse/inode.c
View File

@@ -1747,7 +1747,7 @@ static void fuse_sb_destroy(struct super_block *sb)
struct fuse_mount *fm = get_fuse_mount_super(sb); struct fuse_mount *fm = get_fuse_mount_super(sb);
bool last; bool last;
if (fm) { if (sb->s_root) {
last = fuse_mount_remove(fm); last = fuse_mount_remove(fm);
if (last) if (last)
fuse_conn_destroy(fm); fuse_conn_destroy(fm);

2
fs/fuse/virtio_fs.c
View File

@@ -1394,7 +1394,7 @@ static void virtio_kill_sb(struct super_block *sb)
bool last; bool last;
/* If mount failed, we can still be called without any fc */ /* If mount failed, we can still be called without any fc */
if (fm) { if (sb->s_root) {
last = fuse_mount_remove(fm); last = fuse_mount_remove(fm);
if (last) if (last)
virtio_fs_conn_destroy(fm); virtio_fs_conn_destroy(fm);