From nobody Mon Sep 22 04:54:34 2025 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 4cVW4B3GHmz68ZJt; Mon, 22 Sep 2025 04:54:34 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cVW4B2dSwz3Pdw; Mon, 22 Sep 2025 04:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516874; 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=6RYA3RJdF5d1Oz6I3SvU6oJgyGxWglH9Y3BnddYLxEo=; b=TcgCFldTm1GAPwDQVUXPn4pTA60Q+q0QXFkwjmQPDTi10JH2w7Twc590UJti6ZBNVOqtiz NnhWg8tWcnHNRbwgTXzQCnDuSnaK3/T5cDogrmfX4frofdW4z69PWnBFg5buCgrO2wIZ1H VlpbqkjCbVdr57s1R2sAtrlwQtRYF13XUD70OxluvN+2xOim4P7Aix267O0EQCdVlXhInH Gsxj58ZodFsqkDoiwLqnMHnavEqHg+sx5Uq6+Nm3iJt3gah4FrtIpCS156rBELYGZrRw+c N59uo75w8G7NVneglmPZlSw7SUTG3Kc+vnxC6CoVr3tLaanT19T5P7fES7j9Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516874; 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=6RYA3RJdF5d1Oz6I3SvU6oJgyGxWglH9Y3BnddYLxEo=; b=lM/ULFT3zpMGQQPmg9PJS9GANQfRVaP2BEc6ZbO2GK+m2E3DYyyKKRl3ewCZlGkyHwsWqc /IygAZhFcDRlxx3msUkmq2pL57zpYkkzmWhCxq+J0O8PRGC7L708iUNRyRy+cJ7BHjbVrO kjUxjVB7m6LwrHkHFZD8EMXls1bb7BCox1OZbAY5sr2S+rlbwOQe87tjcIRbHZVYZf6d0l G/eSh+7VpwnxAaX+ZtdNCDyaoP14MVifv0+HpTWHr1Ibih7EENb69w+941Rq6G3RdJPEh1 2TOy1H5VOWR3AtvdaVtA/ZgHvsNc4YUMsphEG/saLo/o9792P3d2rjL696dZ7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758516874; a=rsa-sha256; cv=none; b=b3L16yhozDUyr0I3iOs0r7g3WVQGe0KnXqIvq/Wmnuk7J9f3sczkClNF9f/s6BtbjGDSx1 SvpF8aRApk5CZImBbIvaLLzXL0+h0LYsyUuA2NRiDSqi+JG9Z1CoQndxVUO0/z4733BQLm P9On6CMHic5PSmbQ2mcJiN117kU2WdbYSmNh1AYf4wfSjRDqFgstR6cNPjZH7dpi2OFBop OEpYRPmkcs4L1kWBgSV/tWue2u5YeMoocWxNtpSJJebGq7pVR1J5ynPPh6nt/KY6uG5OBG jygZMS378+DwmfoHwzTGsClzVORMTXfWryDQZDgdPZPS2oSCi6ZiI1WDpZJsKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cVW4B21SBzmLp; Mon, 22 Sep 2025 04:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58M4sYI0093038; Mon, 22 Sep 2025 04:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58M4sY6r093035; Mon, 22 Sep 2025 04:54:34 GMT (envelope-from git) Date: Mon, 22 Sep 2025 04:54:34 GMT Message-Id: <202509220454.58M4sY6r093035@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5367bef13886 - stable/14 - Revert "zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5367bef138862b21f937a66b5647f8f81e6f2ab7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5367bef138862b21f937a66b5647f8f81e6f2ab7 commit 5367bef138862b21f937a66b5647f8f81e6f2ab7 Author: Konstantin Belousov AuthorDate: 2025-09-19 17:05:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-22 04:54:00 +0000 Revert "zfs readdir: if there were no dirents to copy out, return EINVAL same as UFS" PR: 289485, 289678 (cherry picked from commit 932e404f12c172e3d4ec47dedee02da400ef8f92) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index f87182d1c484..c477ad55dbaa 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -1561,7 +1561,6 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, objset_t *os; caddr_t outbuf; size_t bufsize; - ssize_t orig_resid; zap_cursor_t zc; zap_attribute_t zap; uint_t bytes_wanted; @@ -1610,7 +1609,6 @@ zfs_readdir(vnode_t *vp, zfs_uio_t *uio, cred_t *cr, int *eofp, error = 0; os = zfsvfs->z_os; offset = zfs_uio_offset(uio); - orig_resid = zfs_uio_resid(uio); prefetch = zp->z_zn_prefetch; /* @@ -1788,7 +1786,7 @@ update: kmem_free(outbuf, bufsize); if (error == ENOENT) - error = orig_resid == zfs_uio_resid(uio) ? EINVAL : 0; + error = 0; ZFS_ACCESSTIME_STAMP(zfsvfs, zp);