shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 8f40a6318c.

Two reverts needed on android-mainline to fix increment-fs regression.
This is the first one.
Test: Can now install the same apk twice, and repeated installs are
stable.

Bug: 217661925
Bug: 218732047
Bug: 219731048

Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org>
Change-Id: I7a72bba7e44b039ef0383af1fcc8edadab8c5b5c
This commit is contained in:
Tadeusz Struk
2022-03-17 15:35:30 -07:00
parent 77bf53b486
commit d28e72df1d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/incfs/vfs.c
View File

@@ -1872,11 +1872,10 @@ struct dentry *incfs_mount_fs(struct file_system_type *type, int flags,
goto err;
}
mi->mi_backing_dir_path = backing_dir_path;
path_put(&backing_dir_path);
sb->s_flags |= SB_ACTIVE;
pr_debug("incfs: mount\n");
free_options(&options);
return dget(sb->s_root);
err:
sb->s_fs_info = NULL;
@@ -1923,12 +1922,7 @@ void incfs_kill_sb(struct super_block *sb)
struct mount_info *mi = sb->s_fs_info;
pr_debug("incfs: unmount\n");
vfs_rmdir(&init_user_ns, d_inode(mi->mi_backing_dir_path.dentry),
mi->mi_index_dir);
vfs_rmdir(&init_user_ns, d_inode(mi->mi_backing_dir_path.dentry),
mi->mi_incomplete_dir);
kill_anon_super(sb);
generic_shutdown_super(sb);
incfs_free_mount_info(mi);
sb->s_fs_info = NULL;
}