diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c
index 8d4c4e39fa46..ceb0c2e41402 100644
--- a/fs/incfs/vfs.c
+++ b/fs/incfs/vfs.c
@@ -2269,7 +2269,7 @@ struct dentry *incfs_mount_fs(struct file_system_type *type, int flags,
 			goto err;
 	}
 
-	path_put(&backing_dir_path);
+	mi->mi_backing_dir_path = backing_dir_path;
 	sb->s_flags |= SB_ACTIVE;
 
 	pr_debug("incfs: mount\n");
@@ -2309,8 +2309,9 @@ 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;
 }