From d28e72df1dd0c557fba8fc12e216e34b3d9051bc Mon Sep 17 00:00:00 2001 From: Tadeusz Struk Date: Thu, 17 Mar 2022 15:35:30 -0700 Subject: [PATCH] Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount" This reverts commit 8f40a6318cacc7b08bad69010444b3b7ab22c9d5. 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 Change-Id: I7a72bba7e44b039ef0383af1fcc8edadab8c5b5c --- fs/incfs/vfs.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 0d735b0d27ac..5b09f1f83511 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -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; }