From nobody Wed Feb  2 10:39:35 2022
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 5CC3817DA2A4;
	Wed,  2 Feb 2022 10:39:36 +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 4JpdbD1q6Gz4f5d;
	Wed,  2 Feb 2022 10:39:36 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1643798376;
	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=5E4UpSGx8aiM89rQlbyaPzOrG9w4HzYHgTn1uEwMKJU=;
	b=XuzPBYbagXMEhZ0671nk35BwT05HZEWl3JgPEBc6Y1W0xxIJa9RR46/UZ8J9zhwvuRnoMm
	0mVd02w+4HG5JnUhoA9FHrKQipSGjgeNFAuPpL5ZgQtjyIRvMRsoxgomTspiLJMKrM+QSE
	3mJjhmVwryXLJCTW0kJWccGLl1VA9K/zfRkpmjZcUJO8cThWD38gImYUniacVzpE2uKNSS
	LhOERfl/USnJ57xYTSOVWISTMAe9bmJqLyxrmU03SQHuML09w4IUvTkzYnaMp9xWJbqlYD
	ozgY3P3qkvIWhZomqvMl+ThqAU9odlmHnx6xgIa7GA92bl5CZveApqX6EoEUYw==
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 E279222A30;
	Wed,  2 Feb 2022 10:39:35 +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 212AdZZL090848;
	Wed, 2 Feb 2022 10:39:35 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212AdZf4090847;
	Wed, 2 Feb 2022 10:39:35 GMT
	(envelope-from git)
Date: Wed, 2 Feb 2022 10:39:35 GMT
Message-Id: <202202021039.212AdZf4090847@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: 0b8643eaf6e7 - main - vmmeter(): Fix detection of the named swap objects
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 0b8643eaf6e787bac9c33c2ff03d5524cdfd7239
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1643798376;
	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=5E4UpSGx8aiM89rQlbyaPzOrG9w4HzYHgTn1uEwMKJU=;
	b=LMAVECFHzewjBhyAzI/GQfXAkzXH6kZb0RqY6IDFmaYWnNRMlSz0trYZuQXt9+cw9N5los
	VoyzZtpXX9KGJJwexM9JxPekTWCJFh1j2FPKhM8UKoMbpqzCZyUftKeiX0o4q77/GO0FGp
	CpArNNrLhhpIGAkj1pa5PP5Myrbn2kLaicYouyba8kQKsh1CszekztIN2LCO/3PxFrHio1
	7yqHjfA8q3MRKZE6a3PkMnjg3TWX8T7iOd7NZAniieDIQSy8ycsmET9/I4O3WIG5fVIJ8C
	ccj2f8ww31Zma9c9TERl8xKovKvtCpWh5+U0o9YzBpoQ/G2K5QbFs8witLzfCQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643798376; a=rsa-sha256; cv=none;
	b=hoYJFp8PPhMq0xeAD6kK5gx4/ShTtHXD5ruLUOU3NcEuWyQToqhvcEhH75l5+DW5qFMXIB
	LZgR14LZUhKlvMjvNHvilgryQSnUxMr0dunmAwbEY0oKhijx/L6gfMxGCJrszIrB4bSnDR
	2k6MUYi0hy8+pk2VaLHZ/QviSitJR08SYcbw8cUommh2cTvfxlWm4SOoswGjzvzB4/QbZI
	+e3KE1x6v0H07jsvY0ejPHyl6q9feV1wHjQQGyNVizgG9NmRI6G4fGgaSXkw9SRo17PHtU
	0VFCIum07JvtJVMRUeanQejl/2kEwF9bsSW4Te/tmlcNUoLrRgx05P4kfkrHig==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=0b8643eaf6e787bac9c33c2ff03d5524cdfd7239

commit 0b8643eaf6e787bac9c33c2ff03d5524cdfd7239
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2022-01-25 21:03:23 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2022-02-02 09:39:58 +0000

    vmmeter(): Fix detection of the named swap objects
    
    Noted and reviewed by:  markj
    Tested by:      pho
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Differential revision:  https://reviews.freebsd.org/D33549
---
 sys/vm/vm_meter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index d6d2fe72df89..8f3245b1511f 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -243,7 +243,7 @@ vmtotal(SYSCTL_HANDLER_ARGS)
 			continue;
 		}
 		if (object->ref_count == 1 &&
-		    (object->flags & OBJ_ANON) == 0) {
+		    (object->flags & (OBJ_ANON | OBJ_SWAP)) == OBJ_SWAP) {
 			/*
 			 * Also skip otherwise unreferenced swap
 			 * objects backing tmpfs vnodes, and POSIX or