From nobody Wed Apr 03 14:24:56 2024 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 4V8n884ztwz5GtdF; Wed, 3 Apr 2024 14:24:56 +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 4V8n884Qysz4cBn; Wed, 3 Apr 2024 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154296; 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=nmBAQiN5+xBxBTm9sQ6pw3gzWRIuOU8IMC5zAyttLtA=; b=G9m4zX+KEnvi/HFICRmjV6Zq2j+Nx8vrjdRG1icBmZwfX+vEq2tAKGOdf/n+oQw3EaSKmL mbyYhvioxapJspiX2lZmmsfZOVgKlsyyy1R8KrsAcddRA9gN/nWsy/hSRRdtC6wIaeuQAh bHpMGfKLz0nXhg3d48kIWW+zeR9z5i2YS7bA4H29ZOO5y42DayxYXoZ/J8ZUYHqPXAMt3b fmGPI32BzA7JphpvMOSzSB0AGH7kdvGkTE5NR9bwgc99ZuLnr3kRkNqi8pHVIZHPGcHlRC l61+aG3UqquXXEHX8S7kavLGfCn8/u0RjZuxlLSPL/SVZ3iI+e0MmCwhKPCQ2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712154296; a=rsa-sha256; cv=none; b=Y1UTsEh/lLyqA18V+A2vtSkV0FUspMnSlD4rBaj9m2Fcn0Rhl7fupB/16r8qye1TlFbH2o tUO+uKIj4WGcQX9JaXO6Cd78uBQDoRSJ1lxqBM5iD79UrksmkGervTGrsQ5LLRmi550q4S 24UA9c/G2iU97x+F0m8gfNvKV9+dHV+vXVj37WeJsgxSpH5EtSn3Keb/frVSb1QqN2qp9x a/1PjozoYyczHr04788aHUxUF+MZFeVkVcA8lNVaqpCr7oKwcSEb+TTuDd1KkfYi7ZL/We vG3+uHaUpSRA6u/4F4femmCi95ENA1RZlzUCteVxC4du/tc4FDQDvMLTTz/mcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712154296; 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=nmBAQiN5+xBxBTm9sQ6pw3gzWRIuOU8IMC5zAyttLtA=; b=OvA6gF8/QN04b8x8J0aS0lgK87A9E3tLAxVEc8ESaNkH4jFC68wDSA9PO14buyOH0Ya7zf IvuiH2bTzRS5QVAl9GWqX7NiTFdxQ70uM0qN+qmGeIwq7DJ3i9WMLKVG7mKQLAYJEOGUkF SNuCtykG57zBr3rfTEr7CN2DQsctOSd2YaRItQH/ybjqYgpnHC4NmkQINFqp2bflaS6359 0t8VZzkM1+ZqeDJQMWJZL9ca9HDhYOBrQLPyPhbLbAWOBcE9UIuctdlF8EEtrcsOn8Kz6T r8FrxMcfzm0wYKHY8xaUc70deZQwnjgIzHWRecpYWINwWeaTR1GlHU5fv1euAw== 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 4V8n883xcWzc6M; Wed, 3 Apr 2024 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 433EOuTE009012; Wed, 3 Apr 2024 14:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433EOurq009009; Wed, 3 Apr 2024 14:24:56 GMT (envelope-from git) Date: Wed, 3 Apr 2024 14:24:56 GMT Message-Id: <202404031424.433EOurq009009@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0238d3711d9b - main - tarfs: Fix 32-bit 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0238d3711d9b888f678fce4274eccc9175168395 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0238d3711d9b888f678fce4274eccc9175168395 commit 0238d3711d9b888f678fce4274eccc9175168395 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-03 14:24:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-03 14:24:05 +0000 tarfs: Fix 32-bit build. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44613 --- sys/fs/tarfs/tarfs_vfsops.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index cbc3d88eaad8..365234113168 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -80,7 +80,7 @@ struct ustar_header { CTASSERT(sizeof(struct ustar_header) == TARFS_BLOCKSIZE); -#define TAR_EOF ((off_t)-1) +#define TAR_EOF ((size_t)-1) #define TAR_TYPE_FILE '0' #define TAR_TYPE_HARDLINK '1' @@ -430,13 +430,13 @@ tarfs_free_mount(struct tarfs_mount *tmp) * failure. */ static int -tarfs_alloc_one(struct tarfs_mount *tmp, off_t *blknump) +tarfs_alloc_one(struct tarfs_mount *tmp, size_t *blknump) { char block[TARFS_BLOCKSIZE]; struct ustar_header *hdrp = (struct ustar_header *)block; struct sbuf *namebuf = NULL; char *exthdr = NULL, *name = NULL, *link = NULL; - off_t blknum = *blknump; + size_t blknum = *blknump; int64_t num; int endmarker = 0; char *namep, *sep; @@ -861,7 +861,7 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, struct thread *td = curthread; struct tarfs_mount *tmp; struct tarfs_node *root; - off_t blknum; + size_t blknum; time_t mtime; int error;