No to this proposal.
The tree will remain broken until the change is backed out or fixed.
Anton Lindqvist <an...@basename.se> wrote:
> On Sun, Dec 11, 2022 at 02:19:08PM -0700, Vitaliy Makkoveev wrote:
> > CVSROOT: /cvs
> > Module name: src
> > Changes by: m...@cvs.openbsd.org 2022/12/11 14:19:08
> >
> > Modified files:
> > sys/kern : sys_socket.c uipc_socket.c uipc_socket2.c
> > uipc_usrreq.c
> > sys/miscfs/fifofs: fifo_vnops.c
> > sys/netinet : tcp_usrreq.c
> > sys/sys : socketvar.h
> >
> > Log message:
> > This time, socket's buffer lock requires solock() to be held. As a part of
> > socket buffers standalone locking work, move socket state bits which
> > represent its buffers state to per buffer state. Introduce `sb_state' and
> > turn SS_CANTSENDMORE to SBS_CANTSENDMORE. This bit will be processed on
> > `so_snd' buffer only.
> >
> > Move SS_CANTRCVMORE and SS_RCVATMARK bits with separate diff to make
> > review easier and exclude possible so_rcv/so_snd mistypes.
> >
> > Also, don't adjust the remaining SS_* bits right now.
> >
> > ok millert@
>
> Tree is broken due to the SS_CANTSENDMORE removal.
>
> Index: fstat.c
> ===================================================================
> RCS file: /cvs/src/usr.bin/fstat/fstat.c,v
> retrieving revision 1.103
> diff -u -p -r1.103 fstat.c
> --- fstat.c 20 Jun 2022 01:39:44 -0000 1.103
> +++ fstat.c 12 Dec 2022 06:30:21 -0000
> @@ -807,8 +807,6 @@ socktrans(struct kinfo_file *kf)
> if (!(kf->so_state & SS_CANTRCVMORE))
> *cp++ = '<';
> *cp++ = '-';
> - if (!(kf->so_state & SS_CANTSENDMORE))
> - *cp++ = '>';
> *cp = '\0';
> printf(" %s ", shoconn);
> hide((void *)(uintptr_t)kf->unp_conn);
>
