diff options
author | Nathan Scott <nathans@sgi.com> | 2006-03-28 17:55:14 -0500 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-03-28 17:55:14 -0500 |
commit | c41564b5af328ea4600b26119f6c9c8e1eb5c28b (patch) | |
tree | 807890415ed6f4a44158fa29fd740cc042235ecd /fs/xfs/xfs_log.c | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
[XFS] We really suck at spulling. Thanks to Chris Pascoe for fixing all
these typos.
SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:25539a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r-- | fs/xfs/xfs_log.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 9176995160ed..32e841d2f26d 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c | |||
@@ -59,7 +59,7 @@ STATIC xlog_t * xlog_alloc_log(xfs_mount_t *mp, | |||
59 | int num_bblks); | 59 | int num_bblks); |
60 | STATIC int xlog_space_left(xlog_t *log, int cycle, int bytes); | 60 | STATIC int xlog_space_left(xlog_t *log, int cycle, int bytes); |
61 | STATIC int xlog_sync(xlog_t *log, xlog_in_core_t *iclog); | 61 | STATIC int xlog_sync(xlog_t *log, xlog_in_core_t *iclog); |
62 | STATIC void xlog_unalloc_log(xlog_t *log); | 62 | STATIC void xlog_dealloc_log(xlog_t *log); |
63 | STATIC int xlog_write(xfs_mount_t *mp, xfs_log_iovec_t region[], | 63 | STATIC int xlog_write(xfs_mount_t *mp, xfs_log_iovec_t region[], |
64 | int nentries, xfs_log_ticket_t tic, | 64 | int nentries, xfs_log_ticket_t tic, |
65 | xfs_lsn_t *start_lsn, | 65 | xfs_lsn_t *start_lsn, |
@@ -304,7 +304,7 @@ xfs_log_done(xfs_mount_t *mp, | |||
304 | if ((ticket->t_flags & XLOG_TIC_PERM_RESERV) == 0 || | 304 | if ((ticket->t_flags & XLOG_TIC_PERM_RESERV) == 0 || |
305 | (flags & XFS_LOG_REL_PERM_RESERV)) { | 305 | (flags & XFS_LOG_REL_PERM_RESERV)) { |
306 | /* | 306 | /* |
307 | * Release ticket if not permanent reservation or a specifc | 307 | * Release ticket if not permanent reservation or a specific |
308 | * request has been made to release a permanent reservation. | 308 | * request has been made to release a permanent reservation. |
309 | */ | 309 | */ |
310 | xlog_trace_loggrant(log, ticket, "xfs_log_done: (non-permanent)"); | 310 | xlog_trace_loggrant(log, ticket, "xfs_log_done: (non-permanent)"); |
@@ -511,7 +511,7 @@ xfs_log_mount(xfs_mount_t *mp, | |||
511 | vfsp->vfs_flag |= VFS_RDONLY; | 511 | vfsp->vfs_flag |= VFS_RDONLY; |
512 | if (error) { | 512 | if (error) { |
513 | cmn_err(CE_WARN, "XFS: log mount/recovery failed: error %d", error); | 513 | cmn_err(CE_WARN, "XFS: log mount/recovery failed: error %d", error); |
514 | xlog_unalloc_log(mp->m_log); | 514 | xlog_dealloc_log(mp->m_log); |
515 | return error; | 515 | return error; |
516 | } | 516 | } |
517 | } | 517 | } |
@@ -667,7 +667,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) | |||
667 | * | 667 | * |
668 | * Go through the motions of sync'ing and releasing | 668 | * Go through the motions of sync'ing and releasing |
669 | * the iclog, even though no I/O will actually happen, | 669 | * the iclog, even though no I/O will actually happen, |
670 | * we need to wait for other log I/O's that may already | 670 | * we need to wait for other log I/Os that may already |
671 | * be in progress. Do this as a separate section of | 671 | * be in progress. Do this as a separate section of |
672 | * code so we'll know if we ever get stuck here that | 672 | * code so we'll know if we ever get stuck here that |
673 | * we're in this odd situation of trying to unmount | 673 | * we're in this odd situation of trying to unmount |
@@ -704,7 +704,7 @@ xfs_log_unmount_write(xfs_mount_t *mp) | |||
704 | void | 704 | void |
705 | xfs_log_unmount_dealloc(xfs_mount_t *mp) | 705 | xfs_log_unmount_dealloc(xfs_mount_t *mp) |
706 | { | 706 | { |
707 | xlog_unalloc_log(mp->m_log); | 707 | xlog_dealloc_log(mp->m_log); |
708 | } | 708 | } |
709 | 709 | ||
710 | /* | 710 | /* |
@@ -1492,7 +1492,7 @@ xlog_sync(xlog_t *log, | |||
1492 | ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1); | 1492 | ASSERT(XFS_BUF_ADDR(bp) <= log->l_logBBsize-1); |
1493 | ASSERT(XFS_BUF_ADDR(bp) + BTOBB(count) <= log->l_logBBsize); | 1493 | ASSERT(XFS_BUF_ADDR(bp) + BTOBB(count) <= log->l_logBBsize); |
1494 | 1494 | ||
1495 | /* account for internal log which does't start at block #0 */ | 1495 | /* account for internal log which doesn't start at block #0 */ |
1496 | XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart); | 1496 | XFS_BUF_SET_ADDR(bp, XFS_BUF_ADDR(bp) + log->l_logBBstart); |
1497 | XFS_BUF_WRITE(bp); | 1497 | XFS_BUF_WRITE(bp); |
1498 | if ((error = XFS_bwrite(bp))) { | 1498 | if ((error = XFS_bwrite(bp))) { |
@@ -1506,10 +1506,10 @@ xlog_sync(xlog_t *log, | |||
1506 | 1506 | ||
1507 | 1507 | ||
1508 | /* | 1508 | /* |
1509 | * Unallocate a log structure | 1509 | * Deallocate a log structure |
1510 | */ | 1510 | */ |
1511 | void | 1511 | void |
1512 | xlog_unalloc_log(xlog_t *log) | 1512 | xlog_dealloc_log(xlog_t *log) |
1513 | { | 1513 | { |
1514 | xlog_in_core_t *iclog, *next_iclog; | 1514 | xlog_in_core_t *iclog, *next_iclog; |
1515 | xlog_ticket_t *tic, *next_tic; | 1515 | xlog_ticket_t *tic, *next_tic; |
@@ -1539,7 +1539,7 @@ xlog_unalloc_log(xlog_t *log) | |||
1539 | if ((log->l_ticket_cnt != log->l_ticket_tcnt) && | 1539 | if ((log->l_ticket_cnt != log->l_ticket_tcnt) && |
1540 | !XLOG_FORCED_SHUTDOWN(log)) { | 1540 | !XLOG_FORCED_SHUTDOWN(log)) { |
1541 | xfs_fs_cmn_err(CE_WARN, log->l_mp, | 1541 | xfs_fs_cmn_err(CE_WARN, log->l_mp, |
1542 | "xlog_unalloc_log: (cnt: %d, total: %d)", | 1542 | "xlog_dealloc_log: (cnt: %d, total: %d)", |
1543 | log->l_ticket_cnt, log->l_ticket_tcnt); | 1543 | log->l_ticket_cnt, log->l_ticket_tcnt); |
1544 | /* ASSERT(log->l_ticket_cnt == log->l_ticket_tcnt); */ | 1544 | /* ASSERT(log->l_ticket_cnt == log->l_ticket_tcnt); */ |
1545 | 1545 | ||
@@ -1562,7 +1562,7 @@ xlog_unalloc_log(xlog_t *log) | |||
1562 | #endif | 1562 | #endif |
1563 | log->l_mp->m_log = NULL; | 1563 | log->l_mp->m_log = NULL; |
1564 | kmem_free(log, sizeof(xlog_t)); | 1564 | kmem_free(log, sizeof(xlog_t)); |
1565 | } /* xlog_unalloc_log */ | 1565 | } /* xlog_dealloc_log */ |
1566 | 1566 | ||
1567 | /* | 1567 | /* |
1568 | * Update counters atomically now that memcpy is done. | 1568 | * Update counters atomically now that memcpy is done. |
@@ -2829,7 +2829,7 @@ xlog_state_release_iclog(xlog_t *log, | |||
2829 | 2829 | ||
2830 | /* | 2830 | /* |
2831 | * We let the log lock go, so it's possible that we hit a log I/O | 2831 | * We let the log lock go, so it's possible that we hit a log I/O |
2832 | * error or someother SHUTDOWN condition that marks the iclog | 2832 | * error or some other SHUTDOWN condition that marks the iclog |
2833 | * as XLOG_STATE_IOERROR before the bwrite. However, we know that | 2833 | * as XLOG_STATE_IOERROR before the bwrite. However, we know that |
2834 | * this iclog has consistent data, so we ignore IOERROR | 2834 | * this iclog has consistent data, so we ignore IOERROR |
2835 | * flags after this point. | 2835 | * flags after this point. |