git: de8aecebf9e6 - stable/13 - ufs, msdosfs: do not record witness order when creating vnode
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Feb 2022 09:51:01 UTC
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de8aecebf9e641ce43102f0c77689a4ebb5a6a01 commit de8aecebf9e641ce43102f0c77689a4ebb5a6a01 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2022-02-01 05:16:30 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2022-02-07 09:38:50 +0000 ufs, msdosfs: do not record witness order when creating vnode (cherry picked from commit 303d3ae7e8419b457078598b8569e57a5e3fb5ce) --- sys/fs/msdosfs/msdosfs_denode.c | 2 +- sys/ufs/ffs/ffs_vfsops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index a4874b8f4f9c..4e2391b3bf2e 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -180,7 +180,7 @@ badoff: ldep->de_dirclust = dirclust; ldep->de_diroffset = diroffset; ldep->de_inode = inode; - lockmgr(nvp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(nvp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(nvp); /* for doscheckpath */ fc_purge(ldep, 0); /* init the FAT cache for this denode */ error = insmntque(nvp, mntp); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 90cf92305022..89fdc4336834 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1924,7 +1924,7 @@ ffs_vgetf(mp, ino, flags, vpp, ffs_flags) /* * FFS supports recursive locking. */ - lockmgr(vp->v_vnlock, LK_EXCLUSIVE, NULL); + lockmgr(vp->v_vnlock, LK_EXCLUSIVE | LK_NOWITNESS, NULL); VN_LOCK_AREC(vp); vp->v_data = ip; vp->v_bufobj.bo_bsize = fs->fs_bsize;