Date: Thu, 3 Mar 2022 04:59:56 +0000 From: Glen Barber <gjb@freebsd.org> To: Jessica Clarke <jrtc27@freebsd.org> 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> In-Reply-To: <202203030327.2233RDev011223@gitrepo.freebsd.org> References: <202203030327.2233RDev011223@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <jrtc27@FreeBSD.org> > AuthorDate: 2022-03-03 03:22:30 +0000 > Commit: Jessica Clarke <jrtc27@FreeBSD.org> > 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220303045956.GJ13797>