haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-08-01 23:33:42 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
杨赫然 2020-02-17 12:02:50 +08:00
commit c20b17cdbc
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/repo-op.c
View File

@ -6003,7 +6003,7 @@ find_deleted_recursive (SeafRepo *repo,
add_deleted_entry (repo, entries, dent2, base, child, parent); add_deleted_entry (repo, entries, dent2, base, child, parent);
} else if (S_ISDIR(dent1->mode) && strcmp(dent1->id, dent2->id) != 0) { } else if (S_ISDIR(dent1->mode) && strcmp(dent1->id, dent2->id) != 0) {
SeafDir *n1 = seaf_fs_manager_get_seafdir_sorted (seaf->fs_mgr, SeafDir *n1 = seaf_fs_manager_get_seafdir_sorted (seaf->fs_mgr,
repo->id, repo->store_id,
repo->version, repo->version,
dent1->id); dent1->id);
if (!n1) { if (!n1) {
@ -6012,7 +6012,7 @@ find_deleted_recursive (SeafRepo *repo,
} }
SeafDir *n2 = seaf_fs_manager_get_seafdir_sorted (seaf->fs_mgr, SeafDir *n2 = seaf_fs_manager_get_seafdir_sorted (seaf->fs_mgr,
repo->id, repo->store_id,
repo->version, repo->version,
dent2->id); dent2->id);
if (!n2) { if (!n2) {
@ -6056,7 +6056,7 @@ find_deleted (SeafRepo *repo,
int ret = 0; int ret = 0;
d1 = seaf_fs_manager_get_seafdir_sorted_by_path (seaf->fs_mgr, d1 = seaf_fs_manager_get_seafdir_sorted_by_path (seaf->fs_mgr,
repo->id, repo->store_id,
repo->version, repo->version,
child->root_id, base); child->root_id, base);
if (!d1) { if (!d1) {
@ -6064,7 +6064,7 @@ find_deleted (SeafRepo *repo,
} }
d2 = seaf_fs_manager_get_seafdir_sorted_by_path (seaf->fs_mgr, d2 = seaf_fs_manager_get_seafdir_sorted_by_path (seaf->fs_mgr,
repo->id, repo->store_id,
repo->version, repo->version,
parent->root_id, base); parent->root_id, base);
if (!d2) { if (!d2) {

3
server/size-sched.c
View File

@ -320,11 +320,12 @@ compute_repo_size (void *vjob)
goto out; goto out;
} }
if (info){ if (info)
old_head = seaf_commit_manager_get_commit (sched->seaf->commit_mgr, old_head = seaf_commit_manager_get_commit (sched->seaf->commit_mgr,
repo->id, repo->version, repo->id, repo->version,
info->head_id); info->head_id);
if (info && old_head){
gint64 change_size = 0; gint64 change_size = 0;
gint64 change_file_count = 0; gint64 change_file_count = 0;
GList *diff_entries = NULL; GList *diff_entries = NULL;