summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbket <bket@openbsd.org>2020-02-04 04:09:11 +0000
committerbket <bket@openbsd.org>2020-02-04 04:09:11 +0000
commit57e953791f55444fddfb9a410eb2938c2e549d1d (patch)
tree88349ecb21685f4ac24bcdc2b1a63a41c856468d
parentEnable rge(4). (diff)
downloadwireguard-openbsd-57e953791f55444fddfb9a410eb2938c2e549d1d.tar.xz
wireguard-openbsd-57e953791f55444fddfb9a410eb2938c2e549d1d.zip
Replace TAILQ concatenation loop with TAILQ_CONCAT
OK florian@, bluhm@, visa@
-rw-r--r--sys/ufs/ffs/ffs_softdep.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 2f2a2edc224..ed4f309ff18 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep.c,v 1.147 2020/01/14 08:17:08 mpi Exp $ */
+/* $OpenBSD: ffs_softdep.c,v 1.148 2020/02/04 04:09:11 bket Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -4486,10 +4486,7 @@ merge_inode_lists(struct inodedep *inodedep)
}
newadp = TAILQ_FIRST(&inodedep->id_newinoupdt);
}
- while ((newadp = TAILQ_FIRST(&inodedep->id_newinoupdt)) != NULL) {
- TAILQ_REMOVE(&inodedep->id_newinoupdt, newadp, ad_next);
- TAILQ_INSERT_TAIL(&inodedep->id_inoupdt, newadp, ad_next);
- }
+ TAILQ_CONCAT(&inodedep->id_inoupdt, &inodedep->id_newinoupdt, ad_next);
}
/*