From nobody Wed May 03 10:41:34 2023 X-Original-To: dev-commits-src-branches@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 4QBD5V49NBz49CTM; Wed, 3 May 2023 10:41:34 +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 4QBD5V2Qqmz3R04; Wed, 3 May 2023 10:41:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110494; 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=OO7MgqiOXrC36Ulcmw+YWYRkCANRlFY8FnSTegc/Rjo=; b=l3yuHSc7SUatK5Dq+oqrh8QDXSaB5GG37TDC2vm4QSWGVrh2Fph8JiLXyE5zT5zfZUIUZV 3EX/gyg0kG8LoQC5rjEZuM9zbcr4YyDOFxg3wFWErnMN52exLOA4ck/0faSvvHZOc3ilYT HCMgBqIN8mMexAHLJ1W4KzkCuq0t5BiggTF/I9jVy20XCBFMgfFBpUqDHTJ4UMEu23YeAE AoJjcXjOI6pI/d6TBE7BFx636drQwmsiU/lBKsruhxj7yu85Nl8tcDin99Y8JC+WwUFdGJ i1GrKEmLe5o2l/N1JKCdbxtID7Yh/hOP3eFCOMHNwIh3G72WOpwVWX6tmvpU1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110494; 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=OO7MgqiOXrC36Ulcmw+YWYRkCANRlFY8FnSTegc/Rjo=; b=la7fNTeSIQdJnyjkOyDetA1Fhd0/7F0hUjaSnXIHWdx1pSTMk0SvhqZSGsNnTxfkTOPxBn yAQ0jsNjJ4EgTxHhIXP3vrMzvHyX9I4VgCF9UeX6Rn8Q7oSTE4a4Lb4ipYzlmS0BwWFXfq wvlqeRCHKPOYv5OPqYP/P5wHVQBNdvGYGpDNPTcDt4GjNefrMb7sOhPl0PtRm+I12AyEmq l+UTtRVPZKbKQkFA2ZVA0xedFTc56lBA100x8KbZKzfwCa+qWLPbbU4MK2IMBmvRdg0z8W wf4atyKKZBmZhzDLlPnUfy19lqrcbASF4XYSQSm2RaJbBNYykKYxHFo65hbvgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683110494; a=rsa-sha256; cv=none; b=Di/JvH1HZzU4m7uDps1ogvFpDQmgAruq2PMLL0BheuddC+VogHgTQ2ZGC1bjBqktDLwFAD iL/ZnWh3nG6dp6r1YyAknNwBwxRA/xHGvDDO3NEmMkqWXphZ+pznj3DR30WuQ6JeBJJ/Vv 81I6/HTiy0KFP8C8zARdofYQZif0k6nWFLLoNUyYIWWIk+7Z+vt6hX+uHn+4KFJpJLwAEV i0MBZlz9guiusxHlgEVvtH70ttvJFiAM6mbwFNTAyGNRf5eq3u0HJbvrm1gXIv0EY4UDnP 4HcR5oAyuX0qIOX9KBJVU8QwCVH9epVGdx0YUFKtga40fQBIdRlle0+uI1cJFQ== 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 4QBD5V1VzGzRjl; Wed, 3 May 2023 10:41:34 +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 343AfYGK092717; Wed, 3 May 2023 10:41:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343AfY98092716; Wed, 3 May 2023 10:41:34 GMT (envelope-from git) Date: Wed, 3 May 2023 10:41:34 GMT Message-Id: <202305031041.343AfY98092716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3f527b4b8fd5 - stable/12 - vm: fix a number of functions to match the expected prototypes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3f527b4b8fd5555e72d8cd3e388a28f0f7496e30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3f527b4b8fd5555e72d8cd3e388a28f0f7496e30 commit 3f527b4b8fd5555e72d8cd3e388a28f0f7496e30 Author: Dimitry Andric AuthorDate: 2023-04-25 17:52:26 +0000 Commit: Dimitry Andric CommitDate: 2023-05-03 09:36:32 +0000 vm: fix a number of functions to match the expected prototypes Noticed while attempting to make boolean_t unsigned: some vm-related function declarations and defintions were using boolean_t where they should have used int, and vice versa. MFC after: 1 week Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D39753 (cherry picked from commit f74be55e3045793a507d98127faf9aabd918e1ce) --- sys/vm/default_pager.c | 2 +- sys/vm/phys_pager.c | 2 +- sys/vm/sg_pager.c | 4 ++-- sys/vm/swap_pager.c | 2 +- sys/vm/vm_pager.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 877e6441d596..b94279f0198b 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -53,7 +53,7 @@ static void default_pager_dealloc(vm_object_t); static int default_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static void default_pager_putpages(vm_object_t, vm_page_t *, int, - boolean_t, int *); + int, int *); static boolean_t default_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c index dfddbd81061b..5054a7d8e3f6 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -290,7 +290,7 @@ phys_pager_populate(vm_object_t object, vm_pindex_t pidx, int fault_type, } static void -phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, boolean_t sync, +phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags, int *rtvals) { diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c index a31c2bb8fd27..09e90dbf1f19 100644 --- a/sys/vm/sg_pager.c +++ b/sys/vm/sg_pager.c @@ -55,7 +55,7 @@ static vm_object_t sg_pager_alloc(void *, vm_ooffset_t, vm_prot_t, static void sg_pager_dealloc(vm_object_t); static int sg_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static void sg_pager_putpages(vm_object_t, vm_page_t *, int, - boolean_t, int *); + int, int *); static boolean_t sg_pager_haspage(vm_object_t, vm_pindex_t, int *, int *); @@ -210,7 +210,7 @@ sg_pager_getpages(vm_object_t object, vm_page_t *m, int count, int *rbehind, static void sg_pager_putpages(vm_object_t object, vm_page_t *m, int count, - boolean_t sync, int *rtvals) + int flags, int *rtvals) { panic("sg_pager_putpage called"); diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 516be82c474f..d30c5a69ead1 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -369,7 +369,7 @@ static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *); static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int *, int *, pgo_getpages_iodone_t, void *); -static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *); +static void swap_pager_putpages(vm_object_t, vm_page_t *, int, int, int *); static boolean_t swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after); static void swap_pager_init(void); diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 3864c9dfc1c4..fd39ddbcd728 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -123,7 +123,7 @@ dead_pager_putpages(vm_object_t object, vm_page_t *m, int count, rtvals[i] = VM_PAGER_AGAIN; } -static int +static boolean_t dead_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *prev, int *next) {