From nobody Fri Jul 4 15:23:51 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 4bYcqD4dCyz61Lkc; Fri, 04 Jul 2025 15:23: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 4bYcqD0Qmgz3KWh; Fri, 04 Jul 2025 15:23:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751642632; 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=4YzqdVGfpbxoGpD6jAZXaYkEYTpVWYVRBIy8DWrW0UI=; b=gOtcGIfTnZ1osHM2qPNHM5u7XacZPY8KZV6S8pXGD80hAhhKZdjNoFCxNXcymX6OkGHPkt SYUToWNN3eZjQIHX49niORB+A6tTArnhVeFglr1PqIy/zgKBuTJWYl3kROoWCqJAOq47+C fhaLE0Y7RdCNc9G9pW7rX7KTpin3rXioLW/sWfkShf76JheHdjGBzPP6VKHL4hK5v39Nn3 ijyryGEuPpVXJwi+QHrxYCkxM9Z0iedSqvUyN/6eoTAC6DdXDdBrA/jIfyeys/4z2ldlod skfCH7Hc4eJpA0l4XcP+EvuljeaKTq85jjDttaBcv7qV+jgKqF9ARF9WYf6Tww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751642632; 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=4YzqdVGfpbxoGpD6jAZXaYkEYTpVWYVRBIy8DWrW0UI=; b=D8wrOkjPyHyElMOaIyqt1KHmZEHFuhvqgHHfe/foM2UMkrkjK91OGzjrguV8JhzsdkZcA9 TFvoDVVuxHV5wmV1/SVFd34SjZ+Vi8ZAKhapiQb2gXJeZZOwr/kDh1FN8iRd7Y2bf72LEo XOEKVoAtj9r4JQOC7c1XZ6UjgT9kTe68MQb+3fsSiZT7BFg4aroVZc+zKOFVBswJg+ikMp TmNN27N0+JC7unOVI+raFDg36UAmvVMqIqUlsj/q4iUZnzFHUvr9JElkoDqzLd3PBvd8Yd 4y9tqMGa9HgxAViagHtl8igK19Bs8ek0VA4wxcJq8nn0ukkvBDcqjLi44MJxCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751642632; a=rsa-sha256; cv=none; b=lxX8g1Xp2SyjV4MczKIgHPJGxf5+Kn+DJLS7HIixNaMaE9jNk2XDqM/HqhYYauOsWUzb8U Jb/t7r3PiVPBNX5KKmXJ2Wam2e/klDi+UvO+tParQ5xGsOhtieFJARZPJ0AMsm5hbu69Ng rt7KEf168MAAIX8mJ4FL8jLHcObJMLhTZRn5v+A3cyeKSCyo5LZgZgjH+UMvPEt/Y3p9sW dqg1FUSgwcGvoOR5yoF9CaItOuwvIUntgM8/m87T6v6kbScvTBKEE68rxvmwbh4tGdfbby NVtT4/ScAoBH3EIhV49wBeAwT7QMSGsylU8dCVMIFQnJN8yR/oKhyCNgrJVtww== 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 4bYcqC6zt2zw41; Fri, 04 Jul 2025 15:23:51 +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 564FNp1j030077; Fri, 4 Jul 2025 15:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 564FNpx8030074; Fri, 4 Jul 2025 15:23:51 GMT (envelope-from git) Date: Fri, 4 Jul 2025 15:23:51 GMT Message-Id: <202507041523.564FNpx8030074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 369a2542caa9 - main - msdosfs: remove pm_checkpath_lock 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/main X-Git-Reftype: branch X-Git-Commit: 369a2542caa9252ce2e89b0360f85a1c28a908e0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=369a2542caa9252ce2e89b0360f85a1c28a908e0 commit 369a2542caa9252ce2e89b0360f85a1c28a908e0 Author: Konstantin Belousov AuthorDate: 2025-06-02 07:06:16 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-04 15:23:42 +0000 msdosfs: remove pm_checkpath_lock Reviewed by: markj, olce Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50648 --- sys/fs/msdosfs/msdosfs_lookup.c | 1 - sys/fs/msdosfs/msdosfs_vfsops.c | 3 --- sys/fs/msdosfs/msdosfs_vnops.c | 11 +---------- sys/fs/msdosfs/msdosfsmount.h | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c index e799a5ce05f6..8ab6d35a2685 100644 --- a/sys/fs/msdosfs/msdosfs_lookup.c +++ b/sys/fs/msdosfs/msdosfs_lookup.c @@ -845,7 +845,6 @@ doscheckpath(struct denode *source, struct denode *target, daddr_t *wait_scn) *wait_scn = 0; pmp = target->de_pmp; - lockmgr_assert(&pmp->pm_checkpath_lock, KA_XLOCKED); KASSERT(pmp == source->de_pmp, ("doscheckpath: source and target on different filesystems")); diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index adcffe45df82..4431d36c8a8e 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -575,7 +575,6 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) pmp->pm_bo = bo; lockinit(&pmp->pm_fatlock, 0, msdosfs_lock_msg, 0, 0); - lockinit(&pmp->pm_checkpath_lock, 0, "msdoscp", 0, 0); TASK_INIT(&pmp->pm_rw2ro_task, 0, msdosfs_remount_ro, pmp); @@ -871,7 +870,6 @@ error_exit: } if (pmp != NULL) { lockdestroy(&pmp->pm_fatlock); - lockdestroy(&pmp->pm_checkpath_lock); free(pmp->pm_inusemap, M_MSDOSFSFAT); free(pmp, M_MSDOSFSMNT); mp->mnt_data = NULL; @@ -971,7 +969,6 @@ msdosfs_unmount(struct mount *mp, int mntflags) dev_rel(pmp->pm_dev); free(pmp->pm_inusemap, M_MSDOSFSFAT); lockdestroy(&pmp->pm_fatlock); - lockdestroy(&pmp->pm_checkpath_lock); free(pmp, M_MSDOSFSMNT); mp->mnt_data = NULL; return (error); diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 6417b7dac16b..120b97ba72d5 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -945,7 +945,7 @@ msdosfs_rename(struct vop_rename_args *ap) struct denode *fdip, *fip, *tdip, *tip, *nip; u_char toname[12], oldname[11]; u_long to_diroffset; - bool checkpath_locked, doingdirectory, newparent; + bool doingdirectory, newparent; int error; u_long cn, pcl, blkoff; daddr_t bn, wait_scn, scn; @@ -986,8 +986,6 @@ msdosfs_rename(struct vop_rename_args *ap) if (tvp != NULL && tvp != tdvp) VOP_UNLOCK(tvp); - checkpath_locked = false; - relock: doingdirectory = newparent = false; @@ -1108,12 +1106,8 @@ relock: if (doingdirectory && newparent) { if (error != 0) /* write access check above */ goto unlock; - lockmgr(&pmp->pm_checkpath_lock, LK_EXCLUSIVE, NULL); - checkpath_locked = true; error = doscheckpath(fip, tdip, &wait_scn); if (wait_scn != 0) { - lockmgr(&pmp->pm_checkpath_lock, LK_RELEASE, NULL); - checkpath_locked = false; VOP_UNLOCK(fdvp); VOP_UNLOCK(tdvp); VOP_UNLOCK(fvp); @@ -1276,8 +1270,6 @@ relock: cache_purge(fvp); unlock: - if (checkpath_locked) - lockmgr(&pmp->pm_checkpath_lock, LK_RELEASE, NULL); vput(fdvp); vput(fvp); if (tvp != NULL) { @@ -1289,7 +1281,6 @@ unlock: vput(tdvp); return (error); releout: - MPASS(!checkpath_locked); vrele(tdvp); if (tvp != NULL) vrele(tvp); diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index fcaac544a74d..04e6b75bea2a 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -118,7 +118,6 @@ struct msdosfsmount { void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */ struct lock pm_fatlock; /* lockmgr protecting allocations */ - struct lock pm_checkpath_lock; /* protects doscheckpath result */ struct task pm_rw2ro_task; /* context for emergency remount ro */ };