RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2024-12-28 09:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: allow fetch of initial uuid

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2020-10-19 12:19:50 +02:00 committed by Thomas Schoebel-Theuer
parent bd22838db3
commit 77748d31ff
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/sy_old/mars_main.c
View File

@ -2798,14 +2798,6 @@ int peer_action_dent_list(struct mars_peerinfo *peer,
struct mars_global *old_global = NULL;
int status;
if (unlikely(!my_uuid)) {
MARS_ERR("cannot determine my own uuid for peer %s\n", peer->peer);
make_peer_msg(peer, peer_pairs,
"cannot determine my own uuid");
status = -EPROTO;
goto free;
}
MARS_DBG("fetching remote dentries from '%s' '%s'\n",
peer->peer, paths);
@ -2828,8 +2820,10 @@ int peer_action_dent_list(struct mars_peerinfo *peer,
status = -EPROTO;
goto free;
}
if (unlikely(strcmp(peer_uuid->new_link, my_uuid) &&
strcmp(my_uuid, "(any)"))) {
if (unlikely(my_uuid && *my_uuid &&
strcmp(peer_uuid->new_link, my_uuid) &&
strcmp(my_uuid, "(any)") &&
strcmp(peer_uuid->new_link, "(any)"))) {
MARS_ERR("UUID mismatch '%s' != '%s' for peer '%s'\n",
peer_uuid->new_link, my_uuid,
peer->peer);