xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount"

Browse Source 
This reverts commit 6f915dd2af.

This is follow up cleanup after revert of:
"Revert "ANDROID: incremental-fs: fix mount_fs issue"

Bug: 220805927

Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Change-Id: I2ff42145dd586ae6ae4c76c3136e1fad14c08952
This commit is contained in:
Tadeusz Struk
2022-02-23 10:47:36 -08:00
parent 07630c8073
commit 5db3e72c57
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fs/incfs/data_mgmt.c
View File

@@ -175,6 +175,7 @@ void incfs_free_mount_info(struct mount_info *mi)
kfree(mi->pseudo_file_xattr[i].data); kfree(mi->pseudo_file_xattr[i].data);
kfree(mi->mi_per_uid_read_timeouts); kfree(mi->mi_per_uid_read_timeouts);
incfs_free_sysfs_node(mi->mi_sysfs_node); incfs_free_sysfs_node(mi->mi_sysfs_node);
kfree(mi->mi_options.sysfs_name);
kfree(mi); kfree(mi);
} }

9
fs/incfs/vfs.c
View File

@@ -1834,11 +1834,10 @@ struct dentry *incfs_mount_fs(struct file_system_type *type, int flags,
if (error) if (error)
goto err; goto err;
mi->mi_backing_dir_path = backing_dir_path; path_put(&backing_dir_path);
sb->s_flags |= SB_ACTIVE; sb->s_flags |= SB_ACTIVE;
pr_debug("incfs: mount\n"); pr_debug("incfs: mount\n");
free_options(&options);
return dget(sb->s_root); return dget(sb->s_root);
err: err:
sb->s_fs_info = NULL; sb->s_fs_info = NULL;
@@ -1880,13 +1879,9 @@ out:
void incfs_kill_sb(struct super_block *sb) void incfs_kill_sb(struct super_block *sb)
{ {
struct mount_info *mi = sb->s_fs_info; struct mount_info *mi = sb->s_fs_info;
struct inode *dinode = d_inode(mi->mi_backing_dir_path.dentry);
pr_debug("incfs: unmount\n"); pr_debug("incfs: unmount\n");
vfs_rmdir(dinode, mi->mi_index_dir); generic_shutdown_super(sb);
vfs_rmdir(dinode, mi->mi_incomplete_dir);
kill_anon_super(sb);
incfs_free_mount_info(mi); incfs_free_mount_info(mi);
} }