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

fuse: get rid of fuse_put_super()

Browse Source 
The ->put_super callback is called from generic_shutdown_super() in case of
a fully initialized sb.  This is called from kill_***_super(), which is
called from ->kill_sb instances.

Fuse uses ->put_super to destroy the fs specific fuse_mount and drop the
reference to the fuse_conn, while it does the same on each error case
during sb setup.

This patch moves the destruction from fuse_put_super() to
fuse_mount_destroy(), called at the end of all ->kill_sb instances.  A
follup patch will clean up the 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 d534d31d6a
commit a27c061a49
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/fuse/fuse_i.h
View File

@@ -1121,6 +1121,9 @@ int fuse_init_fs_context_submount(struct fs_context *fsc);
*/ */
void fuse_conn_destroy(struct fuse_mount *fm); void fuse_conn_destroy(struct fuse_mount *fm);
/* Drop the connection and free the fuse mount */
void fuse_mount_destroy(struct fuse_mount *fm);
/** /**
* Add connection to control filesystem * Add connection to control filesystem
*/ */

20
fs/fuse/inode.c
View File

@@ -457,14 +457,6 @@ static void fuse_send_destroy(struct fuse_mount *fm)
} }
} }
static void fuse_put_super(struct super_block *sb)
{
struct fuse_mount *fm = get_fuse_mount_super(sb);
fuse_conn_put(fm->fc);
kfree(fm);
}
static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr) static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs *attr)
{ {
stbuf->f_type = FUSE_SUPER_MAGIC; stbuf->f_type = FUSE_SUPER_MAGIC;
@@ -1003,7 +995,6 @@ static const struct super_operations fuse_super_operations = {
.evict_inode = fuse_evict_inode, .evict_inode = fuse_evict_inode,
.write_inode = fuse_write_inode, .write_inode = fuse_write_inode,
.drop_inode = generic_delete_inode, .drop_inode = generic_delete_inode,
.put_super = fuse_put_super,
.umount_begin = fuse_umount_begin, .umount_begin = fuse_umount_begin,
.statfs = fuse_statfs, .statfs = fuse_statfs,
.sync_fs = fuse_sync_fs, .sync_fs = fuse_sync_fs,
@@ -1754,10 +1745,20 @@ static void fuse_sb_destroy(struct super_block *sb)
} }
} }
void fuse_mount_destroy(struct fuse_mount *fm)
{
if (fm) {
fuse_conn_put(fm->fc);
kfree(fm);
}
}
EXPORT_SYMBOL(fuse_mount_destroy);
static void fuse_kill_sb_anon(struct super_block *sb) static void fuse_kill_sb_anon(struct super_block *sb)
{ {
fuse_sb_destroy(sb); fuse_sb_destroy(sb);
kill_anon_super(sb); kill_anon_super(sb);
fuse_mount_destroy(get_fuse_mount_super(sb));
} }
static struct file_system_type fuse_fs_type = { static struct file_system_type fuse_fs_type = {
@@ -1775,6 +1776,7 @@ static void fuse_kill_sb_blk(struct super_block *sb)
{ {
fuse_sb_destroy(sb); fuse_sb_destroy(sb);
kill_block_super(sb); kill_block_super(sb);
fuse_mount_destroy(get_fuse_mount_super(sb));
} }
static struct file_system_type fuseblk_fs_type = { static struct file_system_type fuseblk_fs_type = {

1
fs/fuse/virtio_fs.c
View File

@@ -1400,6 +1400,7 @@ static void virtio_kill_sb(struct super_block *sb)
virtio_fs_conn_destroy(fm); virtio_fs_conn_destroy(fm);
} }
kill_anon_super(sb); kill_anon_super(sb);
fuse_mount_destroy(fm);
} }
static int virtio_fs_test_super(struct super_block *sb, static int virtio_fs_test_super(struct super_block *sb,