From nobody Sun Jul 13 18:24:52 2025 X-Original-To: dev-commits-src-main@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 4bgDPw6X3wz61JZd; Sun, 13 Jul 2025 18:24:52 +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 4bgDPw3ynVz3tbK; Sun, 13 Jul 2025 18:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752431092; 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=wvDq1YgT29nhrJNana5uF3u7lC7RSqkeX2pCpumfsAM=; b=nIBueT2k0y7yGl0N3uEgrhASGIurXPislWVcjhXdU97Bx8WfDIG25snhqfqAyDA97ZsNUM 4zjOxh92tpRkrii/f3e94OJSD4TSU1az2AvGXywbo/15YPfWUdLcEjtcTvpi2WpCV7lZtF +yRhbMMVBov+Btv/PRt7sVzsI0rUbbUVaXKBpGof4SoNcyTYCj6HcJ6VKWVsQnOwHDjIUk ThvfaQ/gVZMdBLyQ3g1LG1PSuJWwDRljT4aLh40PTiy+YlGC1yiLS1/J1YFUFjAsi4aRnT hZmbKuSfFkdhKPa8xbi9ARGJJnD31xEqlwm/qSrtG8BKYbIRk8zjb9wZEPoT6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752431092; 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=wvDq1YgT29nhrJNana5uF3u7lC7RSqkeX2pCpumfsAM=; b=Q/fuH2HExYxPhZbPUv0gOUVzf8lhkltof83fFJlOrlQeY1c1KIauX7GidXerUc4o7UxCC1 lvg31b1laibCa3nvddsl+kUe/Y02265nZd6gfsnJmsCrJAF4gvdX7GrfKm6t9a4iAmm/O8 /qQvhAarPBdq86oSkt81sCynYUg2DM22JCpDxxwMkpQy7ZXEtFh5ftL0gm6gT11pHvslcI w88JEw0bRPjQTzOV/QYybJxK5VrKYoOL9GOFPt5zVu5so/OOGnuFFatqrSOc7WuhLgar/1 AV57umH/f5HVCOz0AEt5vLd93w6ofMIBp6rd2fZTxjRhBi3K9nqeTt9mQFEWgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752431092; a=rsa-sha256; cv=none; b=qLu3aDEc9QywyPmT1hb7m5l8dk+bxCT0QE47PpAAYJpohqD5Ba/1oPdqKlS+UxpTN9Exg0 C8b2aSvCxmL//sqI0lo+Z50hSGXipTuzfu623eREGwD21hirk3btsG6tQBHkLZB6plsyOh 7pQvH6qAi6CY8biBhswAS7JtMOWWtHpGTtdDrYp4fY0RB7VRDtzp6BRy64mKdggxHtRBPq FOn1qGtwjxJtpFbHpuxQvXMj4Wo8AXbuZqtWLDRxxGYwkxwJtSlNJIntnq6Y4yqeYRZwq0 wyK6H1XaTtd+zjIAn4Oh8UbwAPiA/Y+W5bZeQPg8xkbFc8RYrO57k1yd4T7d8A== 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 4bgDPw3R8vz51F; Sun, 13 Jul 2025 18:24:52 +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 56DIOqNf043863; Sun, 13 Jul 2025 18:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DIOqxd043860; Sun, 13 Jul 2025 18:24:52 GMT (envelope-from git) Date: Sun, 13 Jul 2025 18:24:52 GMT Message-Id: <202507131824.56DIOqxd043860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9f6718073382 - main - msdosfs: Fix handling of eofflag in VOP_READDIR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9f6718073382608519912e178e4c313dd61246b3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9f6718073382608519912e178e4c313dd61246b3 commit 9f6718073382608519912e178e4c313dd61246b3 Author: Mark Johnston AuthorDate: 2025-07-13 15:05:51 +0000 Commit: Mark Johnston CommitDate: 2025-07-13 18:24:36 +0000 msdosfs: Fix handling of eofflag in VOP_READDIR We also need to set it when an end-of-directory marker is reached. Reported by: vishwin Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51290 --- sys/fs/msdosfs/msdosfs_vnops.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 5db61c8951f6..33e0d94954d7 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1521,6 +1521,9 @@ msdosfs_readdir(struct vop_readdir_args *ap) ap->a_vp, uio, ap->a_cred, ap->a_eofflag); #endif + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 0; + /* * msdosfs_readdir() won't operate properly on regular files since * it does i/o only with the filesystem vnode, and hence can @@ -1614,8 +1617,11 @@ msdosfs_readdir(struct vop_readdir_args *ap) on = (offset - bias) & pmp->pm_crbomask; n = min(pmp->pm_bpcluster - on, uio->uio_resid); diff = dep->de_FileSize - (offset - bias); - if (diff <= 0) - break; + if (diff <= 0) { + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 1; + goto out; + } n = min(n, diff); error = pcbmap(dep, lbn, &bn, &cn, &blsize); if (error) @@ -1646,6 +1652,8 @@ msdosfs_readdir(struct vop_readdir_args *ap) */ if (dentp->deName[0] == SLOT_EMPTY) { brelse(bp); + if (ap->a_eofflag != NULL) + *ap->a_eofflag = 1; goto out; } /* @@ -1743,15 +1751,6 @@ out: uio->uio_offset = off; - /* - * Set the eofflag (NFS uses it) - */ - if (ap->a_eofflag) { - if (dep->de_FileSize - (offset - bias) <= 0) - *ap->a_eofflag = 1; - else - *ap->a_eofflag = 0; - } return (error); }