Date: Thu, 3 Mar 2022 03:27:13 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 95e945313e8e - stable/13 - fuse: Fix build on 32-bit architectures Message-ID: <202203030327.2233RDev011223@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=95e945313e8e22515d3f0b8a5fce97697746c036 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 fuse: Fix build on 32-bit architectures 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 b214fcceacad ("Change VOP_READDIR's cookies argument to a **uint64_t"), but stable/13 does not. This is a direct commit to stable/13. --- sys/fs/fuse/fuse_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 *ncookies, - 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203030327.2233RDev011223>