From nobody Thu Nov 10 02:31:41 2022 X-Original-To: dev-commits-src-main@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 4N75SY3Mcqz4d9wM; Thu, 10 Nov 2022 02:31:41 +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 4N75SY2xJpz3vny; Thu, 10 Nov 2022 02:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668047501; 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=Ei/J7fdLJsIyFv6XEVeVP5RhAtPAwuDrendG9VlAeq8=; b=DQ7vnUEcRTtrRCxyAEH3z6vskVg1Zuv1VMC7iULLJLrHCL8APz+iB+82JLSOGs7DYpzGqO rxbr3AKAcHQSa4Zd+SFOPBJmfbDUZA8an3gN86F/OH1jouVIM9Tghe0QMaKumsiEK3IXh3 VYFr/5cpzZLRHn6Z5oLil3BMJxberNZrlZV2vXs3nkLsXUfsVbcRnZYf0/QA3H51iTysp2 3wtqUKOtiebQQkR97/TtfEZuCWnIp0ak07N2e/wS+e/mvWObM78la24b38emyWLdvHVn0J 6wrVL1RfM3tRhpISJjLD9wHtCckGpdoQ4fYV2lkxBRu+pVBfzyJC2S/u4tj78w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668047501; 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=Ei/J7fdLJsIyFv6XEVeVP5RhAtPAwuDrendG9VlAeq8=; b=S/b07nmScotJP4ELKhzn0CVhFoDU13qcKcivfwqKLjKKT7H32mLy8K6LjfbtJ7lYPy5uj3 BoP3cavo7DCLpE3imSMKcRRMM08D2Vu3R0YfgGhpXFCKBT4N8lobLGkZd4PzCq/Lg2Zn45 4OrF8SHuMVdjvUKw3SCPygjTA88vC05M2R+/NKiGOi5AxxzeEMOx9fbDxTSWkD1PZC0djh YiZXRqLIARCbeMfCa5LkDriXvCGnN/5JXuwtntZmZsswCRZEhNtRNNsiXGkCBYCHlMzr+/ lleojWgABouV6YRonPlHbO4ZkiAhosabE3yBkHtKqM1xTe6sG3LcaEWCbwvTwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668047501; a=rsa-sha256; cv=none; b=AvGNEOmSymvput0SM4+5pkmNWpxVpCSxENurvWU1IKqiE820NtUbqp7yQpcNgZE2zXHaME rKzuT7GJlQN3o5sOdtRN82QB5PDOCcwAZuVhQ0dl5+TkEVI4AkvlZ+fvOYfGozskWe8CET pw8RRQhwX5fIuU4iYlfBMUCxKfNJ7vSa5NWI3tTpCszvmtKOEiGoRAs4U7YNyQRVuet+rv 4WAO+tVSqm/F4Zg+umS7VVttkicGBEnz3xJ3VbqFgXkawkNp+qa3uulWamCMjtMbpt7iwL j+ZlyNyKv93vzHykprPgFQI90EpYctPQlDPujoPWBW4nPUlrHf5XQI3V3sifAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N75SY203vzknG; Thu, 10 Nov 2022 02:31:41 +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 2AA2Vfj1075934; Thu, 10 Nov 2022 02:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AA2VfNN075933; Thu, 10 Nov 2022 02:31:41 GMT (envelope-from git) Date: Thu, 10 Nov 2022 02:31:41 GMT Message-Id: <202211100231.2AA2VfNN075933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 689a9368eb60 - main - Fix types for fsck_ffs(8) i386 build. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 689a9368eb60f061e10e1924f388b99e8f6c2cb2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=689a9368eb60f061e10e1924f388b99e8f6c2cb2 commit 689a9368eb60f061e10e1924f388b99e8f6c2cb2 Author: Kirk McKusick AuthorDate: 2022-11-10 02:30:25 +0000 Commit: Kirk McKusick CommitDate: 2022-11-10 02:31:19 +0000 Fix types for fsck_ffs(8) i386 build. Reported by: jenkins Reported by: Cy Schubert Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsck.h | 4 ++-- sbin/fsck_ffs/fsutil.c | 2 +- sbin/fsck_ffs/inode.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index a00fedd9ef90..7e714d8d7085 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -469,7 +469,7 @@ int ckinode(union dinode *dp, struct inodesc *); void clri(struct inodesc *, const char *type, int flag); int clearentry(struct inodesc *); void copyonwrite(struct fs *, struct bufarea *, - ufs2_daddr_t (*checkblkavail)(long, long)); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); void direrror(ino_t ino, const char *errmesg); int dirscan(struct inodesc *); int dofix(struct inodesc *, const char *msg); @@ -525,7 +525,7 @@ int setup(char *dev); int snapblkfree(struct fs *, ufs2_daddr_t, long, ino_t, ufs2_daddr_t (*)(ufs2_daddr_t, long)); void snapremove(ino_t); -void snapflush(ufs2_daddr_t (*checkblkavail)(long, long)); +void snapflush(ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); ufs2_daddr_t std_checkblkavail(ufs2_daddr_t blkno, long frags); ufs2_daddr_t suj_checkblkavail(ufs2_daddr_t, long); int suj_check(const char *filesys); diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 5be058dc40c2..7a8dc68cac89 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -522,7 +522,7 @@ flush(int fd, struct bufarea *bp) * the snapshots, no further snapshot copies will need to be done. */ void -snapflush(ufs2_daddr_t (*checkblkavail)(long, long)) +snapflush(ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)) { struct bufarea *bp; int cnt; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 1d36a6ca3e45..85fa6ae8ec1d 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -61,7 +61,7 @@ static ufs2_daddr_t indir_blkatoff(ufs2_daddr_t, ino_t, ufs_lbn_t, ufs_lbn_t, struct bufarea **); static int snapclean(struct inodesc *idesc); static void chkcopyonwrite(struct fs *, ufs2_daddr_t, - ufs2_daddr_t (*checkblkavail)(long, long)); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t, long)); int ckinode(union dinode *dp, struct inodesc *idesc) @@ -804,7 +804,7 @@ snapblkfree(fs, bno, size, inum, checkblkavail) ufs2_daddr_t bno; long size; ino_t inum; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { union dinode *dp; struct inode ip; @@ -934,7 +934,7 @@ void copyonwrite(fs, bp, checkblkavail) struct fs *fs; struct bufarea *bp; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { ufs2_daddr_t copyblkno; long i, numblks; @@ -957,7 +957,7 @@ static void chkcopyonwrite(fs, copyblkno, checkblkavail) struct fs *fs; ufs2_daddr_t copyblkno; - ufs2_daddr_t (*checkblkavail)(long cg, long frags); + ufs2_daddr_t (*checkblkavail)(ufs2_daddr_t blkno, long frags); { struct inode ip; union dinode *dp;