diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-12-01 16:40:57 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-12-01 16:40:57 +0000 |
| commit | a90a45fa8eb82733fb2401aea77fab67471a0d12 (patch) | |
| tree | b425689b8aa975af5f06dec9d849e1627cb95b8b /sys/ufs | |
| parent | afd83459067e8806c325646a976c755c0acd5a2e (diff) | |
Change 'mountlist' from CIRCLEQ to TAILQ. Be paranoid and
use TAILQ_*_SAFE more than might be needed.
Bulk ports build by sthen@ showed nobody sticking their fingers
so deep into the kernel.
Feedback and suggestions from millert@. ok jsing@
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ext2fs/ext2fs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index 6c289a649f8..5d95d4fc3b2 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.68 2013/06/11 16:42:18 deraadt Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.69 2013/12/01 16:40:56 krw Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -137,7 +137,7 @@ ext2fs_mountroot(void) return (error); } - CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list); + TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); ump = VFSTOUFS(mp); fs = ump->um_e2fs; bzero(fs->e2fs_fsmnt, sizeof(fs->e2fs_fsmnt)); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 7bd619538b4..5411af43829 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.122 2013/11/03 02:22:07 krw Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.123 2013/12/01 16:40:56 krw Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -5398,7 +5398,7 @@ clear_inodedeps(struct proc *p) * Ugly code to find mount point given pointer to superblock. */ fs = inodedep->id_fs; - CIRCLEQ_FOREACH(mp, &mountlist, mnt_list) + TAILQ_FOREACH(mp, &mountlist, mnt_list) if ((mp->mnt_flag & MNT_SOFTDEP) && fs == VFSTOUFS(mp)->um_fs) break; /* diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index f5b85dfce2c..e826f925165 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.138 2013/06/11 16:42:18 deraadt Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.139 2013/12/01 16:40:56 krw Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -145,7 +145,7 @@ ffs_mountroot(void) return (error); } - CIRCLEQ_INSERT_TAIL(&mountlist, mp, mnt_list); + TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list); ump = VFSTOUFS(mp); fs = ump->um_fs; (void)copystr(mp->mnt_stat.f_mntonname, fs->fs_fsmnt, MNAMELEN - 1, |