From nobody Thu Mar 03 04:59:56 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 3BE5419F53FD; Thu, 3 Mar 2022 05:00:03 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K8Jh313sTz3PPV; Thu, 3 Mar 2022 05:00:03 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646283603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YC72UyI+14pQgLODF8evXMF2a/EmqzTZVeHdo1iBfkY=; b=UJ3pkoCptxEsns9yNmB1PgnY+9A+/bitPcU+FuQuEnPFEyDUQsTtK3sXjgAUB/E45ZOC6O H+HG2hPnwwhaS+UWdz7qeTVpEv5qHNV7m3KBvWgUkKPyOjBnSvqNkmljh8he+loaFRgSlr NG7y1vxEs6RSu6OFt+JbE7HNXmS09zm1FTzdLcUyUukcbTM+D2hyo4U1Ubld6i3flNgO6N z2EpVuYHiQT0eBtKPjoS+I75ErLwwbbX8H2Lq5ztLG1RHzT7SXWE4jOeXqVrfZQuoSns00 ZUx1bO8La4swhSgWz1loZ/r9dqkrsw2dpKMW0As6H4eDWLzREkd7+wBjKQcnKw== Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 8904BF209; Thu, 3 Mar 2022 05:00:02 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Thu, 3 Mar 2022 04:59:56 +0000 From: Glen Barber To: Jessica Clarke Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 95e945313e8e - stable/13 - fuse: Fix build on 32-bit architectures Message-ID: <20220303045956.GJ13797@FreeBSD.org> References: <202203030327.2233RDev011223@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="PAKmkkBo0+rTwAqJ" Content-Disposition: inline In-Reply-To: <202203030327.2233RDev011223@gitrepo.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646283603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YC72UyI+14pQgLODF8evXMF2a/EmqzTZVeHdo1iBfkY=; b=Y94dWrTq9CyV+NAHfx29dAZC3e6Q4noTmw2cx3R5XuHcrr3A93a81uV+nJygEkJPLr9PAj LYHdGlclkqOk+avPx9/UF5Z6JjQ1GcfjFZvXuPa0EGL+pJjPrYXD8BPfcW0pMv+5+fvATQ wVUdvybzKACcoV7eEp2MkjfVvmuMUiUetGb+uG+KaYK/BGltkiCPvZzLlsKuWa7uu8cQC/ n9C3QN8x+1hPDlijE5Uwi+/Cx66PBj7VdruLz167JDY7aQY5/A2bfLxbueLTWiiYfRNOBL mlJG770E1tfbYmTGeUBtC6jpRmkLs+2RvPd7AlpwCZ3hQEzhIeK05pze/3aF9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646283603; a=rsa-sha256; cv=none; b=GHOq1oi38ZvQtIs4Bo9BirYSt84QB0d4NQr6JYwGOzeNjg9L2tW6fhuQf9jRDYGoXzWF6j M5m7kgjBL6kCk7paTXrtS2ViaLRQvbwiu1/HU6TI/GJoX3TE5csJWdVHxySa+6XnuID/Vp qJRVcCzHaOgYCVySGupgmuN8S9tVBpFnGJg1sMy+s297JvaUdpcOf9ygwSQ99jZFfSpcWy 62wquL+R0IVns3ui6N2jYiFeMaDaiIMwztoB7oCRU5eSvcGOjRHZinxFd7+iVRj1ueRUir SIvCHzqiq887CIxxyGk06fM0rsTgqBH4fkF/OASX/1l3AJCgY4eVNFg+vTK3nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --PAKmkkBo0+rTwAqJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thank you! Glen On Thu, Mar 03, 2022 at 03:27:13AM +0000, Jessica Clarke wrote: > The branch stable/13 has been updated by jrtc27: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D95e945313e8e22515d3f0b8a5f= ce97697746c036 >=20 > commit 95e945313e8e22515d3f0b8a5fce97697746c036 > Author: Jessica Clarke > AuthorDate: 2022-03-03 03:22:30 +0000 > Commit: Jessica Clarke > CommitDate: 2022-03-03 03:22:30 +0000 >=20 > fuse: Fix build on 32-bit architectures > =20 > MFC 3d721de049be ("Fix NFS exports of FUSE file systems for big > directories") missed a case of a uint64_t from HEAD that should be a > u_long in 13 due to KPI differences. Specifically, HEAD has b214fccea= cad > ("Change VOP_READDIR's cookies argument to a **uint64_t"), but stable= /13 > does not. > =20 > This is a direct commit to stable/13. > --- > sys/fs/fuse/fuse_internal.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/sys/fs/fuse/fuse_internal.h b/sys/fs/fuse/fuse_internal.h > index 7d773b02fd8b..ccd72086db2a 100644 > --- a/sys/fs/fuse/fuse_internal.h > +++ b/sys/fs/fuse/fuse_internal.h > @@ -252,7 +252,7 @@ struct pseudo_dirent { > }; > int fuse_internal_readdir(struct vnode *vp, struct uio *uio, > struct fuse_filehandle *fufh, struct fuse_iov *cookediov, int *ncook= ies, > - uint64_t *cookies); > + u_long *cookies); > int fuse_internal_readdir_processdata(struct uio *uio, size_t reqsize, > void *buf, size_t bufsize, struct fuse_iov *cookediov, int *ncookies, > u_long **cookiesp); >=20 --PAKmkkBo0+rTwAqJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmIgS0wACgkQAxRYpUeP 4pMuZw//b0pT0h0WgnhKZ3cMV5bq7bw8GhuUPt/RViTm2Itd9rkalWX9K6V7TnY1 yiT5Icas+LTgZkdPkQTT9CC+IqLj4aJyR1ld2OrVphJyMW7G8GOCnzpFLgE8p8gm 7g85KNWNx/SSiLrVu2tozKk16kg3Of4qtMG47XiA7vLBsLuY57oSuPmG228Sdffe B8dBcBPz86eL7UTjpu+T4ktPW27dOhw5e0XM7T+DwDaEdaftcPgvj9Qc/xeDQegi FGJ//DzmJ5snlmiFY4of/ggQW9aXOp4cBRTBKPgDUGSCsdYpaJ86mdbcXSJEopmP RU0401NRDaUEWyAII6z1ZSnTaaClmOXQynJjzBnDljMLpJnoxh2DfgbXyWEMzfCB qRlGaUJscIJ4bd/Cs2dnIEWriCxodu1wa7tnDPXDDr9Iy8gBkfm5jr0Be9U6PA0O QxmCcPHNmuI7IK1HHpIoMY6OcTaNvCXVUDd/URZ9k7qmVPBNE2dfe+n+Ca/PsTN9 2+QA4o6WQE0D5adDdLBkuAdjW34BaAw8+dpMQVBSNCrZrrgxVk5LXd8GNBlUETSY +9mg6/8sXPH+s7v3OP90kZ9BPYv4OcNedN+GnBwUNTCrHTPoSHn+D4lT/k7uB48L kG6MdeLAQtibC0v1BBGzrPvoiw5APkI21rC/xPm+0Ndd1+q+XoY= =NvqZ -----END PGP SIGNATURE----- --PAKmkkBo0+rTwAqJ--