diff options
author | mckusick <mckusick@FreeBSD.org> | 2013-05-22 00:17:50 +0000 |
---|---|---|
committer | mckusick <mckusick@FreeBSD.org> | 2013-05-22 00:17:50 +0000 |
commit | 684e2dbe37c63ed670f482c2ceef57a05d8e84df (patch) | |
tree | 75053371c9fabf797d88e3778cdd303f9ca77ff6 /sys/ufs | |
parent | 4072f856ebfac2850f3b1853673d9ba2d85ce1f2 (diff) | |
download | FreeBSD-src-684e2dbe37c63ed670f482c2ceef57a05d8e84df.zip FreeBSD-src-684e2dbe37c63ed670f482c2ceef57a05d8e84df.tar.gz |
Properly spell sentinel (not sintenel or sentinal).
No functional changes.
Spotted by: kib
MFC after: 2 weeks
Diffstat (limited to 'sys/ufs')
-rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 7b6abf7..8fd556e 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -656,8 +656,8 @@ FEATURE(softupdates, "FFS soft-updates support"); #define D_SBDEP 24 #define D_JTRUNC 25 #define D_JFSYNC 26 -#define D_SENTINAL 27 -#define D_LAST D_SENTINAL +#define D_SENTINEL 27 +#define D_LAST D_SENTINEL unsigned long dep_current[D_LAST + 1]; unsigned long dep_total[D_LAST + 1]; @@ -1718,7 +1718,7 @@ process_worklist_item(mp, target, flags) int target; int flags; { - struct worklist sintenel; + struct worklist sentinel; struct worklist *wk; struct ufsmount *ump; int matchcnt; @@ -1736,14 +1736,14 @@ process_worklist_item(mp, target, flags) PHOLD(curproc); /* Don't let the stack go away. */ ump = VFSTOUFS(mp); matchcnt = 0; - sintenel.wk_mp = NULL; - sintenel.wk_type = D_SENTINAL; - LIST_INSERT_HEAD(&ump->softdep_workitem_pending, &sintenel, wk_list); - for (wk = LIST_NEXT(&sintenel, wk_list); wk != NULL; - wk = LIST_NEXT(&sintenel, wk_list)) { - if (wk->wk_type == D_SENTINAL) { - LIST_REMOVE(&sintenel, wk_list); - LIST_INSERT_AFTER(wk, &sintenel, wk_list); + sentinel.wk_mp = NULL; + sentinel.wk_type = D_SENTINEL; + LIST_INSERT_HEAD(&ump->softdep_workitem_pending, &sentinel, wk_list); + for (wk = LIST_NEXT(&sentinel, wk_list); wk != NULL; + wk = LIST_NEXT(&sentinel, wk_list)) { + if (wk->wk_type == D_SENTINEL) { + LIST_REMOVE(&sentinel, wk_list); + LIST_INSERT_AFTER(wk, &sentinel, wk_list); continue; } if (wk->wk_state & INPROGRESS) @@ -1800,11 +1800,11 @@ process_worklist_item(mp, target, flags) wake_worklist(wk); add_to_worklist(wk, WK_HEAD); } - LIST_REMOVE(&sintenel, wk_list); + LIST_REMOVE(&sentinel, wk_list); /* Sentinal could've become the tail from remove_from_worklist. */ - if (ump->softdep_worklist_tail == &sintenel) + if (ump->softdep_worklist_tail == &sentinel) ump->softdep_worklist_tail = - (struct worklist *)sintenel.wk_list.le_prev; + (struct worklist *)sentinel.wk_list.le_prev; PRELE(curproc); return (matchcnt); } @@ -12127,7 +12127,7 @@ restart: /* * Sync all cylinder groups that were dirty at the time this function is - * called. Newly dirtied cgs will be inserted before the sintenel. This + * called. Newly dirtied cgs will be inserted before the sentinel. This * is used to flush freedep activity that may be holding up writes to a * indirect block. */ @@ -12137,25 +12137,25 @@ sync_cgs(mp, waitfor) int waitfor; { struct bmsafemap *bmsafemap; - struct bmsafemap *sintenel; + struct bmsafemap *sentinel; struct ufsmount *ump; struct buf *bp; int error; - sintenel = malloc(sizeof(*sintenel), M_BMSAFEMAP, M_ZERO | M_WAITOK); - sintenel->sm_cg = -1; + sentinel = malloc(sizeof(*sentinel), M_BMSAFEMAP, M_ZERO | M_WAITOK); + sentinel->sm_cg = -1; ump = VFSTOUFS(mp); error = 0; ACQUIRE_LOCK(&lk); - LIST_INSERT_HEAD(&ump->softdep_dirtycg, sintenel, sm_next); - for (bmsafemap = LIST_NEXT(sintenel, sm_next); bmsafemap != NULL; - bmsafemap = LIST_NEXT(sintenel, sm_next)) { - /* Skip sintenels and cgs with no work to release. */ + LIST_INSERT_HEAD(&ump->softdep_dirtycg, sentinel, sm_next); + for (bmsafemap = LIST_NEXT(sentinel, sm_next); bmsafemap != NULL; + bmsafemap = LIST_NEXT(sentinel, sm_next)) { + /* Skip sentinels and cgs with no work to release. */ if (bmsafemap->sm_cg == -1 || (LIST_EMPTY(&bmsafemap->sm_freehd) && LIST_EMPTY(&bmsafemap->sm_freewr))) { - LIST_REMOVE(sintenel, sm_next); - LIST_INSERT_AFTER(bmsafemap, sintenel, sm_next); + LIST_REMOVE(sentinel, sm_next); + LIST_INSERT_AFTER(bmsafemap, sentinel, sm_next); continue; } /* @@ -12165,8 +12165,8 @@ sync_cgs(mp, waitfor) bp = getdirtybuf(bmsafemap->sm_buf, &lk, waitfor); if (bp == NULL && waitfor == MNT_WAIT) continue; - LIST_REMOVE(sintenel, sm_next); - LIST_INSERT_AFTER(bmsafemap, sintenel, sm_next); + LIST_REMOVE(sentinel, sm_next); + LIST_INSERT_AFTER(bmsafemap, sentinel, sm_next); if (bp == NULL) continue; FREE_LOCK(&lk); @@ -12178,9 +12178,9 @@ sync_cgs(mp, waitfor) if (error) break; } - LIST_REMOVE(sintenel, sm_next); + LIST_REMOVE(sentinel, sm_next); FREE_LOCK(&lk); - free(sintenel, M_BMSAFEMAP); + free(sentinel, M_BMSAFEMAP); return (error); } |