Module Name: src
Committed By: ad
Date: Sat Feb 22 22:20:47 UTC 2020
Modified Files:
src/sys/ufs/lfs: lfs_segment.c
Log Message:
Make LFS/rump play nice with aiodoned removal.
PR kern/55004 (Hundreds of file system tests now fail on real hardware)
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/sys/ufs/lfs/lfs_segment.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.282 src/sys/ufs/lfs/lfs_segment.c:1.283
--- src/sys/ufs/lfs/lfs_segment.c:1.282 Tue Feb 18 20:23:17 2020
+++ src/sys/ufs/lfs/lfs_segment.c Sat Feb 22 22:20:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.282 2020/02/18 20:23:17 chs Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.283 2020/02/22 22:20:47 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.282 2020/02/18 20:23:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.283 2020/02/22 22:20:47 ad Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -2513,7 +2513,7 @@ lfs_free_aiodone(struct buf *bp)
fs = bp->b_private;
ASSERT_NO_SEGLOCK(fs);
lfs_freebuf(fs, bp);
- KERNEL_UNLOCK_LAST(curlwp);
+ KERNEL_UNLOCK_ONE(curlwp);
}
static void
@@ -2531,7 +2531,7 @@ lfs_super_aiodone(struct buf *bp)
wakeup(&fs->lfs_sbactive);
mutex_exit(&lfs_lock);
lfs_freebuf(fs, bp);
- KERNEL_UNLOCK_LAST(curlwp);
+ KERNEL_UNLOCK_ONE(curlwp);
}
static void
@@ -2664,7 +2664,7 @@ lfs_cluster_aiodone(struct buf *bp)
wakeup(&fs->lfs_iocount);
mutex_exit(&lfs_lock);
- KERNEL_UNLOCK_LAST(curlwp);
+ KERNEL_UNLOCK_ONE(curlwp);
pool_put(&fs->lfs_bpppool, cl->bpp);
cl->bpp = NULL;
