jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

database: refactor cache remounting

cute-signatures
Ariadne Conill 2021-12-28 16:38:31 -06:00 committed by Timo Teräs
parent 4fa6a9fd73
commit ae4008c4f2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/database.c
View File

@ -1535,6 +1535,15 @@ static int setup_cache(struct apk_database *db, struct apk_ctx *ac)
return 0; return 0;
} }
static void remount_cache(struct apk_database *db)
{
if (db->cache_remount_dir) {
mount(0, db->cache_remount_dir, 0, MS_REMOUNT | db->cache_remount_flags, 0);
free(db->cache_remount_dir);
db->cache_remount_dir = NULL;
}
}
#else #else
static int detect_tmpfs_root(struct apk_database *db) static int detect_tmpfs_root(struct apk_database *db)
{ {
@ -1546,6 +1555,11 @@ static int setup_cache(struct apk_database *db, struct apk_ctx *ac)
{ {
return setup_static_cache(db, ac); return setup_static_cache(db, ac);
} }
static void remount_cache(struct apk_database *db)
{
(void) db;
}
#endif #endif
void apk_db_init(struct apk_database *db) void apk_db_init(struct apk_database *db)
@ -1819,11 +1833,7 @@ void apk_db_close(struct apk_database *db)
db->root_proc_dir = NULL; db->root_proc_dir = NULL;
} }
if (db->cache_remount_dir) { remount_cache(db);
mount(0, db->cache_remount_dir, 0, MS_REMOUNT | db->cache_remount_flags, 0);
free(db->cache_remount_dir);
db->cache_remount_dir = NULL;
}
if (db->cache_fd > 0) close(db->cache_fd); if (db->cache_fd > 0) close(db->cache_fd);
if (db->lock_fd > 0) close(db->lock_fd); if (db->lock_fd > 0) close(db->lock_fd);