From 59bdc1cbcc031e33bca56155342247f95344a5b0 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 1 Aug 2008 08:50:24 -0400 Subject: [PATCH] Fix struct loststr / struct empobj mismatch corrupting lostitems The initial parts of struct loststr and struct empobj must match. Commit 49780e2c screwed that up for members lost_uid/uid, which also broke the equivalence of lost_owner/own. Since lost_uid is not used, the former had no effect. But the latter broke xdvisible(). Could make xdump lost leak information. Commit a680c811 reorderd struct loststr members to make lost_timestamp equivalent to new struct empobj member timestamp, but failed due to the bug in commit 49780e2c. Commit f33b96b1 then set the timestamp through empobj, which screwed up timestamps in lostitems, i.e. it broke incremental xdump lost. All of the above is in v4.3.12. Commit 536ef0b0 (v4.3.15) added lost_seqno / seqno. No effect, because only seqno is used. (cherry picked from commit eb252201b69a591523e8a68b41c01f4a80e7b731) --- include/lost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/lost.h b/include/lost.h index 1bb930796..a66246379 100644 --- a/include/lost.h +++ b/include/lost.h @@ -40,7 +40,7 @@ struct loststr { /* initial part must match struct empobj */ short ef_type; - int lost_uid; + short lost_uid; unsigned lost_seqno; time_t lost_timestamp; /* When it was lost */ natid lost_owner; /* Who lost it */ -- 2.43.0