mars_nwe/mars-nwe
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 2 Wiki Activity

log: normalize salvage endpoint messages

Browse Source
This commit is contained in:
Mario Fetka
2026-06-01 14:10:31 +00:00
parent e8a547dfb5
commit 25f0bf9165
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/namspace.c
View File

@@ -2961,9 +2961,11 @@ int nsp_salvage_scan_short_handle(int dir_handle, uint32 sequence,
result = nsp_salvage_build_old_info(&scan, responsedata);
XDPRINTF((3, 0,
"INFO SALVAGE 22/27 DONE fn=0x16 sub=0x1b dh=0x%02x seq=0x%08lx next=0x%08lx name=\"%s\"",
"INFO SALVAGE 22/27 DONE dh=%d seq=%lu next=%lu name=\"%s\" fn=0x16 sub=0x1b dh_hex=0x%02x seq_hex=0x%08lx next_hex=0x%08lx",
dir_handle, (unsigned long)sequence,
(unsigned long)scan.scan_sequence, scan.metadata.original_name));
(unsigned long)scan.scan_sequence, scan.metadata.original_name,
dir_handle, (unsigned long)sequence,
(unsigned long)scan.scan_sequence));
return(result);
}
@@ -2982,8 +2984,9 @@ int nsp_salvage_recover_short_handle(int dir_handle, uint32 sequence, int task)
return(result);
XDPRINTF((3, 0,
"INFO SALVAGE 22/28 DONE fn=0x16 sub=0x1c dh=0x%02x seq=0x%08lx name=\"%s\"",
dir_handle, (unsigned long)sequence, scan.metadata.original_name));
"INFO SALVAGE 22/28 DONE dh=%d seq=%lu name=\"%s\" fn=0x16 sub=0x1c dh_hex=0x%02x seq_hex=0x%08lx",
dir_handle, (unsigned long)sequence, scan.metadata.original_name,
dir_handle, (unsigned long)sequence));
return(0);
}
@@ -3002,8 +3005,9 @@ int nsp_salvage_purge_short_handle(int dir_handle, uint32 sequence)
return(result);
XDPRINTF((3, 0,
"INFO SALVAGE 22/29 DONE fn=0x16 sub=0x1d dh=0x%02x seq=0x%08lx name=\"%s\"",
dir_handle, (unsigned long)sequence, scan.metadata.original_name));
"INFO SALVAGE 22/29 DONE dh=%d seq=%lu name=\"%s\" fn=0x16 sub=0x1d dh_hex=0x%02x seq_hex=0x%08lx",
dir_handle, (unsigned long)sequence, scan.metadata.original_name,
dir_handle, (unsigned long)sequence));
return(0);
}
int handle_func_0x57(uint8 *p, int request_len,
@@ -3013,7 +3017,9 @@ int handle_func_0x57(uint8 *p, int request_len,
int ufunc = (int) *p++;
/* now p locates at 4 byte boundary ! */
int namespace = (int) *p; /* for most calls */
XDPRINTF((3, 0, "0x57 call ufunc=0x%x namespace=%d", ufunc, namespace));
XDPRINTF((3, 0,
"DBUG NCP 87/%d REQUEST ns=%d fn=0x57 sub=0x%02x ns_hex=0x%02x",
ufunc, namespace, ufunc, namespace));
switch (ufunc) {
case 0x01 : /* open creat file or subdir */
{
@@ -3307,10 +3313,12 @@ static int code = 0;
result += (int)(rp - responsedata);
XDPRINTF((3, 0,
"INFO SALVAGE 87/16 DONE fn=0x57 sub=0x10 ns=0x%02x seq=0x%08lx next=0x%08lx name=\"%s\"",
"INFO SALVAGE 87/16 DONE ns=%d seq=%lu next=%lu name=\"%s\" fn=0x57 sub=0x10 ns_hex=0x%02x seq_hex=0x%08lx next_hex=0x%08lx",
req_namespace, (unsigned long)scan_sequence,
(unsigned long)scan.scan_sequence,
scan.metadata.original_name));
scan.metadata.original_name, req_namespace,
(unsigned long)scan_sequence,
(unsigned long)scan.scan_sequence));
}
break;
@@ -3367,10 +3375,12 @@ static int code = 0;
break;
XDPRINTF((3, 0,
"INFO SALVAGE 87/17 DONE fn=0x57 sub=0x11 ns=0x%02x seq=0x%08lx vol=0x%08lx base=0x%08lx name=\"%s\"",
"INFO SALVAGE 87/17 DONE ns=%d seq=%lu vol=%lu base=%lu name=\"%s\" fn=0x57 sub=0x11 ns_hex=0x%02x seq_hex=0x%08lx vol_hex=0x%08lx base_hex=0x%08lx",
req_namespace, (unsigned long)scan_sequence,
(unsigned long)volume, (unsigned long)directory_base,
scan.metadata.original_name));
scan.metadata.original_name, req_namespace,
(unsigned long)scan_sequence, (unsigned long)volume,
(unsigned long)directory_base));
}
break;
@@ -3415,10 +3425,12 @@ static int code = 0;
break;
XDPRINTF((3, 0,
"INFO SALVAGE 87/18 DONE fn=0x57 sub=0x12 ns=0x%02x seq=0x%08lx vol=0x%08lx base=0x%08lx name=\"%s\"",
"INFO SALVAGE 87/18 DONE ns=%d seq=%lu vol=%lu base=%lu name=\"%s\" fn=0x57 sub=0x12 ns_hex=0x%02x seq_hex=0x%08lx vol_hex=0x%08lx base_hex=0x%08lx",
req_namespace, (unsigned long)scan_sequence,
(unsigned long)volume, (unsigned long)directory_base,
scan.metadata.original_name));
scan.metadata.original_name, req_namespace,
(unsigned long)scan_sequence, (unsigned long)volume,
(unsigned long)directory_base));
}
break;