From 88e13027695dd46ebe49db8a1c70504a8cafa084 Mon Sep 17 00:00:00 2001 From: Tadeusz Struk Date: Wed, 23 Feb 2022 09:47:03 -0800 Subject: [PATCH] Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount" This reverts commit fe0c18d0f08da58acf328686a0c78682b54de6b8. This is follow up cleanup after revert of: "Revert "ANDROID: incremental-fs: fix mount_fs issue" Bug: 220805927 Signed-off-by: Tadeusz Struk Change-Id: I7749401484d87b9d519bd7b9600cd02f91a18090 --- fs/incfs/vfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 62425969c75b..b849568ae9b8 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c @@ -2249,7 +2249,7 @@ struct dentry *incfs_mount_fs(struct file_system_type *type, int flags, if (error) 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"); @@ -2286,9 +2286,8 @@ void incfs_kill_sb(struct super_block *sb) struct mount_info *mi = sb->s_fs_info; pr_debug("incfs: unmount\n"); - vfs_rmdir(d_inode(mi->mi_backing_dir_path.dentry), mi->mi_index_dir); - kill_anon_super(sb); incfs_free_mount_info(mi); + generic_shutdown_super(sb); sb->s_fs_info = NULL; }