Re: git: 8c0d1eca7834 - main - sockbuf: retain backward compatibility with userland after d59bc188d652

<br /><br />30.05.2022, 16:18, "Mateusz Guzik" &lt;mjguzik@gmail.com&gt;:<br /><blockquote><p>should probably CTASSERT on size then</p></blockquote>Sorry, I’m afraid I don’t get it. Could you please clarify?<br /><blockquote><p>On 5/30/22, Alexander V. Chernikov &lt;<a href="mailto:melifaro@freebsd.org">melifaro@freebsd.org</a>&gt; wrote:<br /></p><blockquote class="210e7a848e8fcb45wmi-quote"> The branch main has been updated by melifaro:<br /><br /> URL:<br /> <a href="https://cgit.freebsd.org/src/commit/?id=8c0d1eca7834bfd5a05c86bf20a7600917057492">https://cgit.FreeBSD.org/src/commit/?id=8c0d1eca7834bfd5a05c86bf20a7600917057492</a><br /><br /> commit 8c0d1eca7834bfd5a05c86bf20a<span class="1f1ea193f6735cf0wmi-callto">7600917057492</span><br /> Author:     Alexander V. Chernikov &lt;<a href="mailto:melifaro@FreeBSD.org">melifaro@FreeBSD.org</a>&gt;<br /> AuthorDate: <span class="1f1ea193f6735cf0wmi-callto">2022-05-30 14</span>:56:25 +0000<br /> Commit:     Alexander V. Chernikov &lt;<a href="mailto:melifaro@FreeBSD.org">melifaro@FreeBSD.org</a>&gt;<br /> CommitDate: <span class="1f1ea193f6735cf0wmi-callto">2022-05-30 15</span>:10:53 +0000<br /><br />     sockbuf: retain backward compatibility with userland after d59bc188d652<br /><br />     Add spare fields to xsockbuf in place of sb_mcnt / sb_ccnt to avoid<br />      rebuilding userland binaries like sockstat(1).<br /><br />     Reviewed by:    glebius<br /> ---<br />  sys/sys/socketvar.h | 2 ++<br />  1 file changed, 2 insertions(+)<br /><br /> diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h<br /> index 52b9376f0559..249e0800f<span class="1f1ea193f6735cf0wmi-callto">915 100644</span><br /> --- a/sys/sys/socketvar.h<br /> +++ b/sys/sys/socketvar.h<br /> @@ -577,6 +577,8 @@ struct xsocket {<!-- --><br />                  uint32_t	sb_cc;<br />                  uint32_t	sb_hiwat;<br />                  uint32_t	sb_mbcnt;<br /> +		uint32_t	sb_spare0;	/* was sb_mcnt */<br /> +		uint32_t	sb_spare1;	/* was sb_ccnt */<br />                  uint32_t	sb_mbmax;<br />                  int32_t		sb_lowat;<br />                  int32_t		sb_timeo;<br /><br /></blockquote><p><br /><br /></p><span class="f55bbb4eeef208e8wmi-sign">-- <br />Mateusz Guzik &lt;mjguzik gmail.com&gt;<br /></span></blockquote>