From nobody Wed May 3 10:41:12 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 4QBD553hYFz49CKD; Wed, 3 May 2023 10:41:13 +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 4QBD550DHsz3Pyy; Wed, 3 May 2023 10:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110473; 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=hRr/JT9yK4rbkic1zJbSeGzR/8djXlatW3LF+BisZOE=; b=wjBps/YTrxvzsFmg2kYdk5Hamv/gqMmGFtwZcrbJtImZrSlB013HPO4kXs1qZKJCymMX0d CJsqgrgUUysLwlC6hk5vn4MDxruOtBxQNy6MrAZbo2tKph4sLw4fltOJQUjzJThlDWk/SB 9O4Icz6BVcpbQdODt2Gsi0vWj9QhIU7sSp21BAnqZHpyp1gIVTxuqlTcHlPs1R4Dpbj1Ke 9Xi6fh0qmHmJMu6Zwx/DTBvDEKEyILMp9D1JvP4i0mSQVwWsnuZY/QdbwjR6OtamC38MmZ jePqMQhcldaaxUBJlkPcLBXuKEkpkeOSU4vkciLeK9E55b8+aNtfDKcAkbbJaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110473; 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=hRr/JT9yK4rbkic1zJbSeGzR/8djXlatW3LF+BisZOE=; b=vrmrIGn7kePYDZSuadi5uc2y+sXSjY1JZoTQoaThv56RQkK8ZkXDMKH3a2PPAzHveJQALG KxnHMzRWJr9TGf8Juif68JzzZIslxbOVwTLQit4wS8Fdi5EWQRKV3pVqegcsmdyBB2jDlx y888zlPtbQOQE4mCuYutW7NfvwINOss9HIb/pSUGdf6rhp4tYSj6zH7JCHrcpa55saTTCa oJoVXwgngvdiI1E3tVHZzM1MCzAKgTczmJ3yr2rJqPHw/V2yUQ1RkgLVbP1F6qlfhSvaO1 iIbDswAoDC2QRyxhFhxOGQ3/DLunWBKsF993AHcOY8qTRW0Bbl8WZTXMaFfTeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683110473; a=rsa-sha256; cv=none; b=Ktv1dGk9erUwASmT5RlKmp+piCv9Ai4NATCJ7k+1bLhvz2SgRQXg4sbWh6FpZua/F8xc8F +GjXfImOZfHKKTkV3uT4mB9M1knHGyZP5udYQ2KE8zP4xQLuoatzywCRiDBr7xv0QKA7Cz mZBCkHtsy004b/0jyFgD5lqSBdm/4lKRE2oP31xs/46ARg+UkUb5CMgp9l6V49xAInaBaS duXonB0Q2r5a/T9EGGcMIBaGGY5m95bWdQ/y68oelcYdiC5RrnNwwD4mpqj/FTP29U6mbr hqeZIPRKqLNzTHY3jJNcZNe6hCiYXl1Od7ESfU7mQbS1a0SmgOtfXDEZtcOMCQ== 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 4QBD546QjRzRXK; Wed, 3 May 2023 10:41:12 +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 343AfCW4092494; Wed, 3 May 2023 10:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343AfCFN092493; Wed, 3 May 2023 10:41:12 GMT (envelope-from git) Date: Wed, 3 May 2023 10:41:12 GMT Message-Id: <202305031041.343AfCFN092493@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: 35d8e035e22f - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 35d8e035e22f4f79c28cdf713f7da94012a50b1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=35d8e035e22f4f79c28cdf713f7da94012a50b1b commit 35d8e035e22f4f79c28cdf713f7da94012a50b1b Author: Dimitry Andric AuthorDate: 2023-04-25 17:52:26 +0000 Commit: Dimitry Andric CommitDate: 2023-05-03 09:32:57 +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 d07a84f8c98e..b5b756741c73 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -54,7 +54,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 6d7c5a4a7291..07ca6f0fc3de 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -269,7 +269,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 d7af2aed935a..bb2e8f39e219 100644 --- a/sys/vm/sg_pager.c +++ b/sys/vm/sg_pager.c @@ -56,7 +56,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 *); @@ -211,7 +211,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 372019affa46..1143fe935e72 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -426,7 +426,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 cff8f5f9bdc3..ce7271f0dd57 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -129,7 +129,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) {