git: 4d9b2ed34bae - main - ufs: stop using LK_SLEEPFAIL in ffs_sync

From: Mateusz Guzik <mjg_at_FreeBSD.org>
Date: Sun, 23 Jul 2023 13:44:19 UTC
The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=4d9b2ed34bae371dcbff947ffb98a439ed575006

commit 4d9b2ed34bae371dcbff947ffb98a439ed575006
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2023-07-22 07:19:03 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2023-07-23 13:44:15 +0000

    ufs: stop using LK_SLEEPFAIL in ffs_sync
    
    It provides nothing as either locking succeeds or fails with ENOENT as
    is.
---
 sys/ufs/ffs/ffs_vfsops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 560708883cca..9b6ef22b8cd0 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1711,7 +1711,7 @@ ffs_sync(struct mount *mp, int waitfor)
 	}
 	if (waitfor == MNT_WAIT)
 		lockreq = LK_EXCLUSIVE;
-	lockreq |= LK_INTERLOCK | LK_SLEEPFAIL;
+	lockreq |= LK_INTERLOCK;
 loop:
 	/* Grab snapshot of secondary write counts */
 	MNT_ILOCK(mp);
@@ -1741,7 +1741,7 @@ loop:
 			continue;
 		}
 		if ((error = vget(vp, lockreq)) != 0) {
-			if (error == ENOENT || error == ENOLCK) {
+			if (error == ENOENT) {
 				MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp);
 				goto loop;
 			}