iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: fact out common grant head/log tail verification code

Browse Source 
Factor repeated debug code out of grant head manipulation functions into a
separate function. This removes ifdef DEBUG spagetti from the code and makes
the code easier to follow.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Dave Chinner 2010-12-21 12:02:52 +11:00 committed by Dave Chinner
parent 1054794198
commit 3f336c6fa1
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
fs/xfs/xfs_log.c
View File

@ -82,6 +82,7 @@ STATIC void xlog_ungrant_log_space(xlog_t *log,
#if defined(DEBUG) #if defined(DEBUG)
STATIC void xlog_verify_dest_ptr(xlog_t *log, char *ptr); STATIC void xlog_verify_dest_ptr(xlog_t *log, char *ptr);
STATIC void xlog_verify_grant_head(xlog_t *log, int equals); STATIC void xlog_verify_grant_head(xlog_t *log, int equals);
STATIC void xlog_verify_grant_tail(struct log *log);
STATIC void xlog_verify_iclog(xlog_t *log, xlog_in_core_t *iclog, STATIC void xlog_verify_iclog(xlog_t *log, xlog_in_core_t *iclog,
int count, boolean_t syncing); int count, boolean_t syncing);
STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog, STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog,
@ -89,6 +90,7 @@ STATIC void xlog_verify_tail_lsn(xlog_t *log, xlog_in_core_t *iclog,
#else #else
#define xlog_verify_dest_ptr(a,b) #define xlog_verify_dest_ptr(a,b)
#define xlog_verify_grant_head(a,b) #define xlog_verify_grant_head(a,b)
#define xlog_verify_grant_tail(a)
#define xlog_verify_iclog(a,b,c,d) #define xlog_verify_iclog(a,b,c,d)
#define xlog_verify_tail_lsn(a,b,c) #define xlog_verify_tail_lsn(a,b,c)
#endif #endif
@ -2503,10 +2505,6 @@ xlog_grant_log_space(xlog_t *log,
{ {
int free_bytes; int free_bytes;
int need_bytes; int need_bytes;
#ifdef DEBUG
xfs_lsn_t tail_lsn;
#endif
#ifdef DEBUG #ifdef DEBUG
if (log->l_flags & XLOG_ACTIVE_RECOVERY) if (log->l_flags & XLOG_ACTIVE_RECOVERY)
@ -2577,21 +2575,9 @@ redo:
/* we've got enough space */ /* we've got enough space */
xlog_grant_add_space(log, need_bytes); xlog_grant_add_space(log, need_bytes);
#ifdef DEBUG
tail_lsn = log->l_tail_lsn;
/*
* Check to make sure the grant write head didn't just over lap the
* tail. If the cycles are the same, we can't be overlapping.
* Otherwise, make sure that the cycles differ by exactly one and
* check the byte count.
*/
if (CYCLE_LSN(tail_lsn) != log->l_grant_write_cycle) {
ASSERT(log->l_grant_write_cycle-1 == CYCLE_LSN(tail_lsn));
ASSERT(log->l_grant_write_bytes <= BBTOB(BLOCK_LSN(tail_lsn)));
}
#endif
trace_xfs_log_grant_exit(log, tic); trace_xfs_log_grant_exit(log, tic);
xlog_verify_grant_head(log, 1); xlog_verify_grant_head(log, 1);
xlog_verify_grant_tail(log);
spin_unlock(&log->l_grant_lock); spin_unlock(&log->l_grant_lock);
return 0; return 0;
@ -2621,9 +2607,6 @@ xlog_regrant_write_log_space(xlog_t *log,
xlog_ticket_t *tic) xlog_ticket_t *tic)
{ {
int free_bytes, need_bytes; int free_bytes, need_bytes;
#ifdef DEBUG
xfs_lsn_t tail_lsn;
#endif
tic->t_curr_res = tic->t_unit_res; tic->t_curr_res = tic->t_unit_res;
xlog_tic_reset_res(tic); xlog_tic_reset_res(tic);
@ -2719,17 +2702,9 @@ redo:
/* we've got enough space */ /* we've got enough space */
xlog_grant_add_space_write(log, need_bytes); xlog_grant_add_space_write(log, need_bytes);
#ifdef DEBUG
tail_lsn = log->l_tail_lsn;
if (CYCLE_LSN(tail_lsn) != log->l_grant_write_cycle) {
ASSERT(log->l_grant_write_cycle-1 == CYCLE_LSN(tail_lsn));
ASSERT(log->l_grant_write_bytes <= BBTOB(BLOCK_LSN(tail_lsn)));
}
#endif
trace_xfs_log_regrant_write_exit(log, tic); trace_xfs_log_regrant_write_exit(log, tic);
xlog_verify_grant_head(log, 1); xlog_verify_grant_head(log, 1);
xlog_verify_grant_tail(log);
spin_unlock(&log->l_grant_lock); spin_unlock(&log->l_grant_lock);
return 0; return 0;
@ -3465,6 +3440,24 @@ xlog_verify_grant_head(xlog_t *log, int equals)
} }
} /* xlog_verify_grant_head */ } /* xlog_verify_grant_head */
STATIC void
xlog_verify_grant_tail(
struct log *log)
{
xfs_lsn_t tail_lsn = log->l_tail_lsn;
/*
* Check to make sure the grant write head didn't just over lap the
* tail. If the cycles are the same, we can't be overlapping.
* Otherwise, make sure that the cycles differ by exactly one and
* check the byte count.
*/
if (CYCLE_LSN(tail_lsn) != log->l_grant_write_cycle) {
ASSERT(log->l_grant_write_cycle - 1 == CYCLE_LSN(tail_lsn));
ASSERT(log->l_grant_write_bytes <= BBTOB(BLOCK_LSN(tail_lsn)));
}
}
/* check if it will fit */ /* check if it will fit */
STATIC void STATIC void
xlog_verify_tail_lsn(xlog_t *log, xlog_verify_tail_lsn(xlog_t *log,