* [PATCH] Fix non-debug build for xfsidbg.c
@ 2008-04-30 6:59 David Chinner
2008-04-30 7:17 ` Lachlan McIlroy
0 siblings, 1 reply; 6+ messages in thread
From: David Chinner @ 2008-04-30 6:59 UTC (permalink / raw)
To: xfs-dev; +Cc: xfs-oss
Make the use of l_iclog_bak conditional on debug configs.
Signed-off-by: Dave Chinner <dgc@sgi.com>
---
fs/xfs/xfsidbg.c | 5 +++++
1 file changed, 5 insertions(+)
Index: 2.6.x-xfs-new/fs/xfs/xfsidbg.c
===================================================================
--- 2.6.x-xfs-new.orig/fs/xfs/xfsidbg.c 2008-04-30 16:47:06.000000000 +1000
+++ 2.6.x-xfs-new/fs/xfs/xfsidbg.c 2008-04-30 16:49:33.615164895 +1000
@@ -5845,9 +5845,14 @@ xfsidbg_xlog(xlog_t *log)
kdb_printf("curr_cycle: %d prev_cycle: %d curr_block: %d prev_block: %d\n",
log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block,
log->l_prev_block);
+#ifdef DEBUG
kdb_printf("iclog_bak: 0x%p iclog_size: 0x%x (%d) num iclogs: %d\n",
log->l_iclog_bak, log->l_iclog_size, log->l_iclog_size,
log->l_iclog_bufs);
+#else
+ kdb_printf("iclog_size: 0x%x (%d) num iclogs: %d\n",
+ log->l_iclog_size, log->l_iclog_size, log->l_iclog_bufs);
+#endif
kdb_printf("l_iclog_hsize %d l_iclog_heads %d\n",
log->l_iclog_hsize, log->l_iclog_heads);
kdb_printf("l_sectbb_log %u l_sectbb_mask %u\n",
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Fix non-debug build for xfsidbg.c 2008-04-30 6:59 [PATCH] Fix non-debug build for xfsidbg.c David Chinner @ 2008-04-30 7:17 ` Lachlan McIlroy 2008-05-01 0:49 ` David Chinner 0 siblings, 1 reply; 6+ messages in thread From: Lachlan McIlroy @ 2008-04-30 7:17 UTC (permalink / raw) To: David Chinner; +Cc: xfs-dev, xfs-oss Dave, would the code look cleaner if iclog_bak was printed on a line by itself? That way we wouldn't need the #else and we wouldn't be duplicating code. David Chinner wrote: > Make the use of l_iclog_bak conditional on debug configs. > > Signed-off-by: Dave Chinner <dgc@sgi.com> > --- > fs/xfs/xfsidbg.c | 5 +++++ > 1 file changed, 5 insertions(+) > > Index: 2.6.x-xfs-new/fs/xfs/xfsidbg.c > =================================================================== > --- 2.6.x-xfs-new.orig/fs/xfs/xfsidbg.c 2008-04-30 16:47:06.000000000 +1000 > +++ 2.6.x-xfs-new/fs/xfs/xfsidbg.c 2008-04-30 16:49:33.615164895 +1000 > @@ -5845,9 +5845,14 @@ xfsidbg_xlog(xlog_t *log) > kdb_printf("curr_cycle: %d prev_cycle: %d curr_block: %d prev_block: %d\n", > log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block, > log->l_prev_block); > +#ifdef DEBUG > kdb_printf("iclog_bak: 0x%p iclog_size: 0x%x (%d) num iclogs: %d\n", > log->l_iclog_bak, log->l_iclog_size, log->l_iclog_size, > log->l_iclog_bufs); > +#else > + kdb_printf("iclog_size: 0x%x (%d) num iclogs: %d\n", > + log->l_iclog_size, log->l_iclog_size, log->l_iclog_bufs); > +#endif > kdb_printf("l_iclog_hsize %d l_iclog_heads %d\n", > log->l_iclog_hsize, log->l_iclog_heads); > kdb_printf("l_sectbb_log %u l_sectbb_mask %u\n", > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix non-debug build for xfsidbg.c 2008-04-30 7:17 ` Lachlan McIlroy @ 2008-05-01 0:49 ` David Chinner 2008-05-01 1:42 ` Lachlan McIlroy 0 siblings, 1 reply; 6+ messages in thread From: David Chinner @ 2008-05-01 0:49 UTC (permalink / raw) To: Lachlan McIlroy; +Cc: David Chinner, xfs-dev, xfs-oss On Wed, Apr 30, 2008 at 05:17:24PM +1000, Lachlan McIlroy wrote: > Dave, would the code look cleaner if iclog_bak was printed on a line by > itself? > That way we wouldn't need the #else and we wouldn't be duplicating code. Yup, probably a good idea. I've changed it to match how this is handled in other places in xfsidbg.c: @@ -5846,8 +5846,12 @@ log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block, log->l_prev_block); kdb_printf("iclog_bak: 0x%p iclog_size: 0x%x (%d) num iclogs: %d\n", - log->l_iclog_bak, log->l_iclog_size, log->l_iclog_size, - log->l_iclog_bufs); +#ifdef DEBUG + log->l_iclog_bak, +#else + NULL, +#endif + log->l_iclog_size, log->l_iclog_size, log->l_iclog_bufs); kdb_printf("l_iclog_hsize %d l_iclog_heads %d\n", log->l_iclog_hsize, log->l_iclog_heads); kdb_printf("l_sectbb_log %u l_sectbb_mask %u\n", Cheers, Dave. -- Dave Chinner Principal Engineer SGI Australian Software Group ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix non-debug build for xfsidbg.c 2008-05-01 0:49 ` David Chinner @ 2008-05-01 1:42 ` Lachlan McIlroy 2008-05-01 3:01 ` David Chinner 0 siblings, 1 reply; 6+ messages in thread From: Lachlan McIlroy @ 2008-05-01 1:42 UTC (permalink / raw) To: David Chinner; +Cc: xfs-dev, xfs-oss Sorry I should have been clearer. What I actually meant was something like this: --- a/fs/xfs/xfsidbg.c 2008-05-01 11:34:55.000000000 +1000 +++ b/fs/xfs/xfsidbg.c 2008-05-01 11:35:18.000000000 +1000 @@ -5845,9 +5845,11 @@ kdb_printf("curr_cycle: %d prev_cycle: %d curr_block: %d prev_block: %d\n", log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block, log->l_prev_block); - kdb_printf("iclog_bak: 0x%p iclog_size: 0x%x (%d) num iclogs: %d\n", - log->l_iclog_bak, log->l_iclog_size, log->l_iclog_size, - log->l_iclog_bufs); +#ifdef DEBUG + kdb_printf("iclog_bak: 0x%p\n", log->l_iclog_bak); +#endif + kdb_printf("iclog_size: 0x%x (%d) num iclogs: %d\n", + log->l_iclog_size, log->l_iclog_size, log->l_iclog_bufs); kdb_printf("l_iclog_hsize %d l_iclog_heads %d\n", log->l_iclog_hsize, log->l_iclog_heads); kdb_printf("l_sectbb_log %u l_sectbb_mask %u\n", This way there is no code duplicated between the debug and non-debug cases. But I'm fine with your approach too. Lachlan David Chinner wrote: > On Wed, Apr 30, 2008 at 05:17:24PM +1000, Lachlan McIlroy wrote: >> Dave, would the code look cleaner if iclog_bak was printed on a line by >> itself? >> That way we wouldn't need the #else and we wouldn't be duplicating code. > > Yup, probably a good idea. I've changed it to match how this is handled > in other places in xfsidbg.c: > > @@ -5846,8 +5846,12 @@ > log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block, > log->l_prev_block); > kdb_printf("iclog_bak: 0x%p iclog_size: 0x%x (%d) num iclogs: %d\n", > - log->l_iclog_bak, log->l_iclog_size, log->l_iclog_size, > - log->l_iclog_bufs); > +#ifdef DEBUG > + log->l_iclog_bak, > +#else > + NULL, > +#endif > + log->l_iclog_size, log->l_iclog_size, log->l_iclog_bufs); > kdb_printf("l_iclog_hsize %d l_iclog_heads %d\n", > log->l_iclog_hsize, log->l_iclog_heads); > kdb_printf("l_sectbb_log %u l_sectbb_mask %u\n", > > Cheers, > > Dave. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix non-debug build for xfsidbg.c 2008-05-01 1:42 ` Lachlan McIlroy @ 2008-05-01 3:01 ` David Chinner 2008-05-01 7:22 ` Lachlan McIlroy 0 siblings, 1 reply; 6+ messages in thread From: David Chinner @ 2008-05-01 3:01 UTC (permalink / raw) To: Lachlan McIlroy; +Cc: David Chinner, xfs-dev, xfs-oss On Thu, May 01, 2008 at 11:42:00AM +1000, Lachlan McIlroy wrote: > Sorry I should have been clearer. What I actually meant was something > like this: Whatever. It's not worth arguing about. I just want to get it fixed. Cheers, Dave. -- Dave Chinner Principal Engineer SGI Australian Software Group ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix non-debug build for xfsidbg.c 2008-05-01 3:01 ` David Chinner @ 2008-05-01 7:22 ` Lachlan McIlroy 0 siblings, 0 replies; 6+ messages in thread From: Lachlan McIlroy @ 2008-05-01 7:22 UTC (permalink / raw) To: David Chinner; +Cc: xfs-dev, xfs-oss Agree. David Chinner wrote: > On Thu, May 01, 2008 at 11:42:00AM +1000, Lachlan McIlroy wrote: >> Sorry I should have been clearer. What I actually meant was something >> like this: > > Whatever. It's not worth arguing about. I just want to get it fixed. > > Cheers, > > Dave. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-01 7:21 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-04-30 6:59 [PATCH] Fix non-debug build for xfsidbg.c David Chinner 2008-04-30 7:17 ` Lachlan McIlroy 2008-05-01 0:49 ` David Chinner 2008-05-01 1:42 ` Lachlan McIlroy 2008-05-01 3:01 ` David Chinner 2008-05-01 7:22 ` Lachlan McIlroy
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox