From nobody Thu Mar 3 03:27:13 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 DC25319E3B05; Thu, 3 Mar 2022 03:27:13 +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 4K8Gcx5rYkz4vnT; Thu, 3 Mar 2022 03:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646278033; 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=1e294Ln0fFjgWiLHyy7uTmgEGbk6CxSHEt1bxseH7Mk=; b=neJBMRN5stRihbiRLmgE9h0+gQa0Jrr2Dw6xWJHdaX4wFdYEA/mBn4dyQ3fEDd80iHwdpG KqyNrNKyjdjygf3lH0THlR+/EMGRaDQPWPRSy6wCSzZN1cdXzI6AtCVuOtdWW0TtNww4bb /DZF/PgrVuepR0LZoLVuJPz/xC1PwpnYcHEAyEvEgCJZlirXhDmhP9SWt602PSw57mhFLF c3Zsyful5XhPvVslXDNOLowvg93DfxM2a24WFwuoBBDDHQYEoZN3CMjqPlYdYPwJMwhZ6Z XYoyUZB7JtCd90kOxcryVpQroSNnVOgYH69LIFt5BwaOpOuP5+7H1AFvGBvFIw== 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 A7D6810655; Thu, 3 Mar 2022 03:27:13 +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 2233RDtu011224; Thu, 3 Mar 2022 03:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2233RDev011223; Thu, 3 Mar 2022 03:27:13 GMT (envelope-from git) Date: Thu, 3 Mar 2022 03:27:13 GMT Message-Id: <202203030327.2233RDev011223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 95e945313e8e - stable/13 - fuse: Fix build on 32-bit architectures 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: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95e945313e8e22515d3f0b8a5fce97697746c036 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646278033; 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=1e294Ln0fFjgWiLHyy7uTmgEGbk6CxSHEt1bxseH7Mk=; b=FQZJj/a4+8KsV7nHRG5jPBNY84mUJGoi97pfF2d5qC5S5T9b9UKQmJ8NWTs0BDpjzareYY ZHqXk7xex2xx7l/34M72FYFiUWHYJEsLy/eInjwMvxrLn13VDG/xej4IqZicigtly7I/x6 6P4QO/jxMh5RWBqJA7ZriseZC2Z9hy4uW/P1ckghKq9cD032/4TK7PKd2S0Y6//DoUMS3y mXEnr611UIpgSOmJHBYoUrI/+nNGAJc3MzB8yl1rznqGu179x7wu1G7AagMqOTNbKPkpyo p4UJ/ChQ0cZH1ArrMYaXWMtVr/oqLz6vvCEKzSgvPsm7GuHa//l98VIo4gxIVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646278033; a=rsa-sha256; cv=none; b=IehJtJI6nuyIUaQBL+B+RiTfW2qVqXb414xdvVpCxGjtEnq64wGzXtpADbxz5Wcy4jI4PK Zfj/6AElKpslUsnlNK9cg28GQ0IsXfijent+Fuxw/j3opLwYsnQelyCD5+DmhvlLJDmp8e h0tj46E0rRhJyWs+/0pma6PP0T5WGlY529OMoWONOa+B+gmuBnEwUcKuWB7iavBw9ZdZUk ld5iySxJOr4TrSMa6w/l22Zbbq858Ae2Wmq7eQfzwmK+b+tgvbkn84n2dNQvJc33R5EC1T /varAiINXa+XSwGZ85Yv3cBv9LUMOm43Wm4HH5eH1GMSoZYjoPMV3e6H0Xhb0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=95e945313e8e22515d3f0b8a5fce97697746c036 commit 95e945313e8e22515d3f0b8a5fce97697746c036 Author: Jessica Clarke AuthorDate: 2022-03-03 03:22:30 +0000 Commit: Jessica Clarke 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);