From nobody Wed Dec 15 11:28:51 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 56E4118EDC7C; Wed, 15 Dec 2021 11:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JDY0g73Ztz3C55; Wed, 15 Dec 2021 11:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CECC61B394; Wed, 15 Dec 2021 11:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BFBSpYs095102; Wed, 15 Dec 2021 11:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BFBSp1Q095101; Wed, 15 Dec 2021 11:28:51 GMT (envelope-from git) Date: Wed, 15 Dec 2021 11:28:51 GMT Message-Id: <202112151128.1BFBSp1Q095101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 5dab06a00318 - main - sys/queue.h: move trashing from SLIST_REMOVE to REMOVE_AFTER, REMOVE_HEAD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5dab06a003189ebb017810bdbf3b3c2f074afd3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639567732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IY3421fGYnWilzdkXPmSzlhFOTru+UqhUIAx2J9tMg0=; b=hYMbRHUchZc0Dq5eSA+RlJQysodAFeQDMAOT6qfyiEkc66IDYZ8eYy5qvY5KYtEs/UXNDN DkXyyiB8AH/GIZvSwgFpC5YWb9aGyh7T2NOgAv4/4QSpgyNpIXwvFsKyWy2EZTzLejDamt gd9VII+RgrnpXFz6nQkNcIjGJFd5OT8ZxS6IAimo5a0y6aa/dD1ZXOH0f5kAiWcEld7yoL OkUgw02LxojjrbOSStETEnYPFZlc3unPdZWDV2D975eYnsPIzBFPJ65A6ESV08Ej3SCaH5 cOyYEt0NY5LlOjlkQUUXbUyuOUPR7dS3jJ6FUK5UJK4aMCnYorjgjhY5RJruuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639567732; a=rsa-sha256; cv=none; b=jR7KL+clni+Xuk71FVgMS6mBZZPrCdnbOB2NL6e93ZVl7MvS4sl63Ijg0FlUCZdBaGVjE0 vxHOqXx6qAHbFaACqQUAEXRDyNrtVVTJ7MgvdRZSJEVM0VeIUphqOHeYHS1zzADRTLHYyt o1NpgvMFtDyPwhNU0t7AeKV7delCnuiwPc5z++YCOR3pVDk3qKFJLZuF+AGSfWPJPBIX9s madreVzlj+50CNpKgTMzG8bNPW4t21KMGVAfAIf3ZEVmbdyK3IE4y18eh/cJjNXZQW/yf0 5wVZnyJUGmmqkL6/KFD3+i27GYeWtfYLjylY9Qwryd8spIa0WoJ7pALkD0pinw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=5dab06a003189ebb017810bdbf3b3c2f074afd3e commit 5dab06a003189ebb017810bdbf3b3c2f074afd3e Author: Andriy Gapon AuthorDate: 2021-12-15 11:27:49 +0000 Commit: Andriy Gapon CommitDate: 2021-12-15 11:28:33 +0000 sys/queue.h: move trashing from SLIST_REMOVE to REMOVE_AFTER, REMOVE_HEAD SLIST_REMOVE calls either REMOVE_AFTER or REMOVE_HEAD to do the job. But those two macros can be used independently as well. MFC after: 2 weeks --- sys/sys/queue.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 25091ec815f1..6c7c37308b4d 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -272,7 +272,6 @@ struct { \ #define SLIST_NEXT(elm, field) ((elm)->field.sle_next) #define SLIST_REMOVE(head, elm, type, field) do { \ - QMD_SAVELINK(oldnext, (elm)->field.sle_next); \ if (SLIST_FIRST((head)) == (elm)) { \ SLIST_REMOVE_HEAD((head), field); \ } \ @@ -282,16 +281,19 @@ struct { \ curelm = SLIST_NEXT(curelm, field); \ SLIST_REMOVE_AFTER(curelm, field); \ } \ - TRASHIT(*oldnext); \ } while (0) #define SLIST_REMOVE_AFTER(elm, field) do { \ + QMD_SAVELINK(oldnext, SLIST_NEXT(elm, field)->field.sle_next); \ SLIST_NEXT(elm, field) = \ SLIST_NEXT(SLIST_NEXT(elm, field), field); \ + TRASHIT(*oldnext); \ } while (0) #define SLIST_REMOVE_HEAD(head, field) do { \ + QMD_SAVELINK(oldnext, SLIST_FIRST(head)->field.sle_next); \ SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \ + TRASHIT(*oldnext); \ } while (0) #define SLIST_REMOVE_PREVPTR(prevp, elm, field) do { \