diff options
| author |   Miklos Szeredi <mszeredi@redhat.com> | 2021-10-21 10:01:38 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2021-10-21 10:01:38 +0200 |
| commit | d534d31d6a45d71de61db22090b4820afb68fddc (patch) | |
| tree | ffaf3b2b74b8976d49eabffd4b6614decc2c8364 /fs/fuse | |
| parent | Linux 5.15-rc6 (diff) | |
| download | linux-dev-d534d31d6a45d71de61db22090b4820afb68fddc.tar.xz linux-dev-d534d31d6a45d71de61db22090b4820afb68fddc.zip | |
fuse: check s_root when destroying sb
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>
Diffstat (limited to 'fs/fuse')
| -rw-r--r-- | fs/fuse/inode.c | 2 | ||||
| -rw-r--r-- | fs/fuse/virtio_fs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 36cd03114b6d..60ceaf332840 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1747,7 +1747,7 @@ static void fuse_sb_destroy(struct super_block *sb) struct fuse_mount *fm = get_fuse_mount_super(sb); bool last; - if (fm) { + if (sb->s_root) { last = fuse_mount_remove(fm); if (last) fuse_conn_destroy(fm); diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index 0ad89c6629d7..32fd138c621e 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -1394,7 +1394,7 @@ static void virtio_kill_sb(struct super_block *sb) bool last; /* If mount failed, we can still be called without any fc */ - if (fm) { + if (sb->s_root) { last = fuse_mount_remove(fm); if (last) virtio_fs_conn_destroy(fm); |