diff options
author | Jose R. Santos <jrs@us.ibm.com> | 2007-07-18 08:57:06 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-07-18 08:57:06 -0400 |
commit | e23291b9120c11aafb2ee76fb71a062eb3c1056c (patch) | |
tree | 1a0f458c5c2803eb9a959e79622974cd5db4f985 /fs/ext4 | |
parent | eb40a09c679d7f9709f7087add57f2e1c7122bb3 (diff) |
jbd2: Fix CONFIG_JBD_DEBUG ifdef to be CONFIG_JBD2_DEBUG
When the JBD code was forked to create the new JBD2 code base, the
references to CONFIG_JBD_DEBUG where never changed to
CONFIG_JBD2_DEBUG. This patch fixes that.
Signed-off-by: Jose R. Santos <jrs@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/balloc.c | 4 | ||||
-rw-r--r-- | fs/ext4/ioctl.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index 9de54ae48dee..e53b4af52f11 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c | |||
@@ -517,7 +517,7 @@ do_more: | |||
517 | /* | 517 | /* |
518 | * An HJ special. This is expensive... | 518 | * An HJ special. This is expensive... |
519 | */ | 519 | */ |
520 | #ifdef CONFIG_JBD_DEBUG | 520 | #ifdef CONFIG_JBD2_DEBUG |
521 | jbd_unlock_bh_state(bitmap_bh); | 521 | jbd_unlock_bh_state(bitmap_bh); |
522 | { | 522 | { |
523 | struct buffer_head *debug_bh; | 523 | struct buffer_head *debug_bh; |
@@ -1597,7 +1597,7 @@ allocated: | |||
1597 | 1597 | ||
1598 | performed_allocation = 1; | 1598 | performed_allocation = 1; |
1599 | 1599 | ||
1600 | #ifdef CONFIG_JBD_DEBUG | 1600 | #ifdef CONFIG_JBD2_DEBUG |
1601 | { | 1601 | { |
1602 | struct buffer_head *debug_bh; | 1602 | struct buffer_head *debug_bh; |
1603 | 1603 | ||
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 9737432f079d..5b00775d5096 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -141,7 +141,7 @@ flags_err: | |||
141 | ext4_journal_stop(handle); | 141 | ext4_journal_stop(handle); |
142 | return err; | 142 | return err; |
143 | } | 143 | } |
144 | #ifdef CONFIG_JBD_DEBUG | 144 | #ifdef CONFIG_JBD2_DEBUG |
145 | case EXT4_IOC_WAIT_FOR_READONLY: | 145 | case EXT4_IOC_WAIT_FOR_READONLY: |
146 | /* | 146 | /* |
147 | * This is racy - by the time we're woken up and running, | 147 | * This is racy - by the time we're woken up and running, |
@@ -283,7 +283,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
283 | case EXT4_IOC32_SETVERSION_OLD: | 283 | case EXT4_IOC32_SETVERSION_OLD: |
284 | cmd = EXT4_IOC_SETVERSION_OLD; | 284 | cmd = EXT4_IOC_SETVERSION_OLD; |
285 | break; | 285 | break; |
286 | #ifdef CONFIG_JBD_DEBUG | 286 | #ifdef CONFIG_JBD2_DEBUG |
287 | case EXT4_IOC32_WAIT_FOR_READONLY: | 287 | case EXT4_IOC32_WAIT_FOR_READONLY: |
288 | cmd = EXT4_IOC_WAIT_FOR_READONLY; | 288 | cmd = EXT4_IOC_WAIT_FOR_READONLY; |
289 | break; | 289 | break; |