From nobody Mon Sep 22 04:53:49 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 4cVW3K5x2dz68ZdL; Mon, 22 Sep 2025 04:53:49 +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 4cVW3K5Pr9z3NZW; Mon, 22 Sep 2025 04:53:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516829; 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=Y6P9GSgtY6aINs6dXrU+wZh53/4CtjcY61t6g4dyteU=; b=vUz/+GREp7EPpCWET8O5Sz+gPjqOiIhaB2cj0OKyn7+PSQ3SXHQWb28/T2cBEHOVtFcwEr MMm6bMjR0nBKSs4DqEwseMz+j+WhXEGC4/9uvdYnx26bt4/6GiF6+9iZL+zFc4OI8Q4YyX tYen9U+xHpSaepVG4w9meEnrGBMNAOWcef8DBwnHoF+6PL0O4XkGClr3Ud5PzZyrU1zGEL s7ww92jUaaYxTTRl7kpJXpzoqEFAywEiBNjXNoShH8j0vW+n2hHbiSNOO93xO2P1r2EurJ 0fT5GA6/G/Pu3GOJFyGenSSwx/E/0uKjxc1pxg8aPLU8Dj6ylM1fdrKfrNnbHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758516829; 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=Y6P9GSgtY6aINs6dXrU+wZh53/4CtjcY61t6g4dyteU=; b=l7ulxSLD00UHMwC+XjnfbT+p79M5zAsIqKeFGiHqsVr9JYM3dnQP+NxKNx677HpNQyoUjU /L89DF/9BXOIz6PD1lfNBGH/SfNG75SCBKVJAGOCwwxnPwKDcezcjTzQNgcgT4KdE+mw6X Jk0/eI0xJ7IHOaoA0/NWV8GcJVVpa7NQcA8gap8fAbujRJBrC3GMgZgjfSJ6w2lXkZYeaW xc3657MI/wesn0ZYItIDrzwheiA6gkjQ2W4AZSom12kL4HW/6/lw1VlBiLkMGqoK/O6LeY EHBw9ObbJFhd74WOdVfPB3OWoYNnydNp3zE170sNJYSte5BumZsiZlaXbs2E4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758516829; a=rsa-sha256; cv=none; b=YE2uadMG25Pq1k8+RigblZMu4iPdrBKUh/KiPxzlQFQ6fkDoNRB2XMPMAsmpoRbtwWthLo G0YwKO9ssLAU7qUnXWyNq4D3rUO36g4Kdr2xhqg5JoXeCunFgptuD6qUAncWY5TlfW0mnR Gz2hER8GC3a2uA7G87doyXONRrndmHOCNwVlKnSahvkNa8pzY0kkw2DM2ysZ4w4bID3FzI 9s8tJtS08u6fQn7U1HX3iNrobtFwpccf0WRMWXr6ETpcejUnWnNn2LLzuXEALFXc8ORBus DEyc/+ZsKWE3XHnCbRVp1tC4qgeJ8n0CmouX3+1Ais3x6WrSH3+EOah7AfdcMQ== 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 4cVW3K4tbLzmNn; Mon, 22 Sep 2025 04:53:49 +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 58M4rnTA092663; Mon, 22 Sep 2025 04:53:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58M4rnPA092660; Mon, 22 Sep 2025 04:53:49 GMT (envelope-from git) Date: Mon, 22 Sep 2025 04:53:49 GMT Message-Id: <202509220453.58M4rnPA092660@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: de19a7d54d30 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: de19a7d54d30483343dbc526af8e0b4cb83892f7 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de19a7d54d30483343dbc526af8e0b4cb83892f7 commit de19a7d54d30483343dbc526af8e0b4cb83892f7 Author: Konstantin Belousov AuthorDate: 2025-09-19 17:05:08 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-21 23:25:16 +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 174141a5deab..6b55329da7a7 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 @@ -1695,7 +1695,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; @@ -1744,7 +1743,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; zap = zap_attribute_long_alloc(); @@ -1924,7 +1922,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);