sync with OpenBSD -current

This commit is contained in:
purplerain 2024-05-07 21:04:28 +00:00
parent a6677bfd36
commit 223def2739
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
29 changed files with 687 additions and 529 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: uipc_socket2.c,v 1.153 2024/05/03 17:43:09 mvs Exp $ */
/* $OpenBSD: uipc_socket2.c,v 1.154 2024/05/07 15:54:23 claudio Exp $ */
/* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */
/*
@ -552,7 +552,10 @@ sblock(struct socket *so, struct sockbuf *sb, int flags)
if (!(flags & SBL_WAIT))
rwflags |= RW_NOSLEEP;
return rw_enter(&sb->sb_lock, rwflags);
error = rw_enter(&sb->sb_lock, rwflags);
if (error == EBUSY)
error = EWOULDBLOCK;
return error;
}
soassertlocked(so);