git: 91ef0d6ac65f - stable/13 - ffs: reduce number of dvp relocks in softdep_prelink()
Konstantin Belousov
kib at FreeBSD.org
Wed Jul 7 11:11:00 UTC 2021
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=91ef0d6ac65f20fe677802146f5fa308793c6443
commit 91ef0d6ac65f20fe677802146f5fa308793c6443
Author: Konstantin Belousov <kib at FreeBSD.org>
AuthorDate: 2021-04-29 22:21:33 +0000
Commit: Konstantin Belousov <kib at FreeBSD.org>
CommitDate: 2021-07-07 10:23:40 +0000
ffs: reduce number of dvp relocks in softdep_prelink()
(cherry picked from commit d0929a990c80b78bc84326234cf54cd4382d42fd)
---
sys/ufs/ffs/ffs_softdep.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 2cc16ab2a2c1..dbd08905d953 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -3392,10 +3392,9 @@ softdep_prelink(dvp, vp)
if (vp != NULL)
VOP_UNLOCK(vp);
ffs_syncvnode(dvp, MNT_WAIT, 0);
- VOP_UNLOCK(dvp);
-
/* Process vp before dvp as it may create .. removes. */
if (vp != NULL) {
+ VOP_UNLOCK(dvp);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
if (vp->v_data == NULL) {
vn_lock_pair(dvp, false, vp, true);
@@ -3406,12 +3405,11 @@ softdep_prelink(dvp, vp)
process_truncates(vp);
FREE_LOCK(ump);
VOP_UNLOCK(vp);
- }
-
- vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
- if (dvp->v_data == NULL) {
- vn_lock_pair(dvp, true, vp, false);
- return (ERELOOKUP);
+ vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
+ if (dvp->v_data == NULL) {
+ vn_lock_pair(dvp, true, vp, false);
+ return (ERELOOKUP);
+ }
}
ACQUIRE_LOCK(ump);
More information about the dev-commits-src-all
mailing list