From nobody Tue Aug 12 12:56:12 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 4c1Whs1DMmz64jZW; Tue, 12 Aug 2025 12:56: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1Whr6GJTz3KQ5; Tue, 12 Aug 2025 12:56:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003372; 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=gy9rR4XERgQyYYJsCweiNqSrfV8PSOqJD648mz8B7K0=; b=EL3uCj6r8mlmvT/2r8lgg8YG265r/GVzJSB2sZ0UwUryuZatKU56V/tX4GtE51aLeV4gZO wUOilRDBDbecQ9iB99gxLkeUdsG1i+SKRkTpuHsjal64l0znUHEMQXfGvbkf6N+X9XZyIA IWzKmPAcgbalVd4EB7yWwcLe4SciIoRSwKZeo/3GnD39EuPbTa8x2apgc12byJmlMsrIYg hLtvfUUT/q4AFTywe53RCWXfdgn63cDw4nGsrgizB+aEbX9Xl424zreG//OSjWi0ODhI0p obigVBD6LKd5C7qXmQpMOlVObsSlQ0QyNK4CS1fYqaQUQOjrWXrpn+IV+EW4uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003372; 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=gy9rR4XERgQyYYJsCweiNqSrfV8PSOqJD648mz8B7K0=; b=P1+t2AFdDBN1CY30q+AfyKd2iyexO0UXDTQ7qMJlRZAtzvmLgnYh0l59b2gNmys7zSef/c OOv/GGDQrIXwA7G7gj/bM1M8e12qIyjKa61xdLv2As6PWWqnRmh7xD9cXmzHtSslqIWKtq l5WI4dVTb+TSjjkePVARcO76LBhU1UNsYpRQQSAt5WrnmXc7TuXDBHMk69zbDFIDYOxpwG KVl972k5CUabcWv5PJ2Zbwz8yacjSlZqJ/OEE+xMOGHUssKWee4tnvWhLGXnKSMozRxs5g BFWCf0lVCpfrzJI4T6w9Q9KEwrv+nxmmsM/wvp8L0Cs5K+46p6vbRRf+xCaw6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755003372; a=rsa-sha256; cv=none; b=pAxBqETKeyM1AYnsfU7BLFPESkXXCUouyj6c/L3Zfi8c4w50VERYrKaAGwoO38H0DatWXX VAONFBNxOmY+AkTwfXGWWS7gcDJi0mdlvYaYFYjD6+P6sm+1RmYNrezMqQb/pzZfSalo7x gXSPUycxmuVp4j8OyEwJPxJXSdF1WyuoGI8STSV9UQDSGqkqYY2Nb6I/PbaeSIOseK6lsI y61615BGON9Zf80mXQIhCKBOsF7EPLIsVzrFlnI+NWaWwm9I42lcnxIxNRAs/XUc94JYJe IVVM2ze0Kyd1zQYLaS0Zq1yySUTZucj9iEEI7qroGmU2WzLnDVZVwAqLLlp9OQ== 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 4c1Whr5qbGzfn3; Tue, 12 Aug 2025 12:56:12 +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 57CCuCiw088412; Tue, 12 Aug 2025 12:56:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CCuCcn088409; Tue, 12 Aug 2025 12:56:12 GMT (envelope-from git) Date: Tue, 12 Aug 2025 12:56:12 GMT Message-Id: <202508121256.57CCuCcn088409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 85f964f75eea - stable/14 - smbfs: Set eofflag in VOP_READDIR 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85f964f75eea1f67fe2ae661014770c22adf41fd Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=85f964f75eea1f67fe2ae661014770c22adf41fd commit 85f964f75eea1f67fe2ae661014770c22adf41fd Author: Mark Johnston AuthorDate: 2025-07-23 16:19:44 +0000 Commit: Mark Johnston CommitDate: 2025-08-12 12:49:42 +0000 smbfs: Set eofflag in VOP_READDIR MFC after: 2 weeks (cherry picked from commit 619308b6fe26f56fc71c6255b13fcd9a6b8ae1f1) --- sys/fs/smbfs/smbfs_io.c | 20 +++++++++++++------- sys/fs/smbfs/smbfs_node.h | 2 +- sys/fs/smbfs/smbfs_vnops.c | 6 ++---- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 35454998fc8e..8c484381ed59 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -71,7 +71,7 @@ SYSCTL_INT(_vfs_smbfs, OID_AUTO, fastlookup, CTLFLAG_RW, &smbfs_fastlookup, 0, " #define DE_SIZE (sizeof(struct dirent)) static int -smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) +smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred, int *eofp) { struct dirent de; struct componentname cn; @@ -86,6 +86,8 @@ smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) SMBVDEBUG("dirname='%s'\n", np->n_name); scred = smbfs_malloc_scred(); smb_makescred(scred, uio->uio_td, cred); + if (eofp != NULL) + *eofp = 0; offset = uio->uio_offset / DE_SIZE; /* offset in the directory */ limit = uio->uio_resid / DE_SIZE; if (uio->uio_resid < DE_SIZE || uio->uio_offset < 0) { @@ -138,8 +140,7 @@ smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) if (error) { smbfs_findclose(np->n_dirseq, scred); np->n_dirseq = NULL; - error = ENOENT ? 0 : error; - goto out; + goto out1; } } error = 0; @@ -170,16 +171,21 @@ smbfs_readvdir(struct vnode *vp, struct uio *uio, struct ucred *cred) if (error) break; } - if (error == ENOENT) - error = 0; uio->uio_offset = offset * DE_SIZE; +out1: + if (error == ENOENT) { + if (eofp != NULL) + *eofp = 1; + error = 0; + } out: smbfs_free_scred(scred); return error; } int -smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred) +smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred, + int *eofp) { struct smbmount *smp = VFSTOSMBFS(vp->v_mount); struct smbnode *np = VTOSMB(vp); @@ -209,7 +215,7 @@ smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred) lks = LK_EXCLUSIVE; /* lockstatus(vp->v_vnlock); */ if (lks == LK_SHARED) vn_lock(vp, LK_UPGRADE | LK_RETRY); - error = smbfs_readvdir(vp, uiop, cred); + error = smbfs_readvdir(vp, uiop, cred, eofp); if (lks == LK_SHARED) vn_lock(vp, LK_DOWNGRADE | LK_RETRY); return error; diff --git a/sys/fs/smbfs/smbfs_node.h b/sys/fs/smbfs/smbfs_node.h index f28f0007100a..8c8ce038b913 100644 --- a/sys/fs/smbfs/smbfs_node.h +++ b/sys/fs/smbfs/smbfs_node.h @@ -93,7 +93,7 @@ u_int32_t smbfs_hash(const u_char *name, int nmlen); int smbfs_getpages(struct vop_getpages_args *); int smbfs_putpages(struct vop_putpages_args *); -int smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred); +int smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred, int *eofp); int smbfs_writevnode(struct vnode *vp, struct uio *uiop, struct ucred *cred, int ioflag); void smbfs_attr_cacheenter(struct vnode *vp, struct smbfattr *fap); int smbfs_attr_cachelookup(struct vnode *vp ,struct vattr *va); diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index c30995508c00..1fccee7983c6 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -466,7 +466,7 @@ smbfs_read(struct vop_read_args *ap) SMBVDEBUG("\n"); if (vp->v_type != VREG && vp->v_type != VDIR) return EPERM; - return smbfs_readvnode(vp, uio, ap->a_cred); + return smbfs_readvnode(vp, uio, ap->a_cred, NULL); } static int @@ -748,7 +748,6 @@ smbfs_readdir(struct vop_readdir_args *ap) { struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; - int error; if (vp->v_type != VDIR) return (EPERM); @@ -758,8 +757,7 @@ smbfs_readdir(struct vop_readdir_args *ap) return (EOPNOTSUPP); } #endif - error = smbfs_readvnode(vp, uio, ap->a_cred); - return error; + return (smbfs_readvnode(vp, uio, ap->a_cred, ap->a_eofflag)); } /* ARGSUSED */