Skip to content

Commit e23291b

Browse files
Jose R. Santostytso
Jose R. Santos
authored and
tytso
committed
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>
1 parent eb40a09 commit e23291b

File tree

7 files changed

+17
-17
lines changed

7 files changed

+17
-17
lines changed

‎fs/ext4/balloc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb,
517517
/*
518518
* An HJ special. This is expensive...
519519
*/
520-
#ifdef CONFIG_JBD_DEBUG
520+
#ifdef CONFIG_JBD2_DEBUG
521521
jbd_unlock_bh_state(bitmap_bh);
522522
{
523523
struct buffer_head *debug_bh;
@@ -1597,7 +1597,7 @@ ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode,
15971597

15981598
performed_allocation = 1;
15991599

1600-
#ifdef CONFIG_JBD_DEBUG
1600+
#ifdef CONFIG_JBD2_DEBUG
16011601
{
16021602
struct buffer_head *debug_bh;
16031603

‎fs/ext4/ioctl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
141141
ext4_journal_stop(handle);
142142
return err;
143143
}
144-
#ifdef CONFIG_JBD_DEBUG
144+
#ifdef CONFIG_JBD2_DEBUG
145145
case EXT4_IOC_WAIT_FOR_READONLY:
146146
/*
147147
* 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)
283283
case EXT4_IOC32_SETVERSION_OLD:
284284
cmd = EXT4_IOC_SETVERSION_OLD;
285285
break;
286-
#ifdef CONFIG_JBD_DEBUG
286+
#ifdef CONFIG_JBD2_DEBUG
287287
case EXT4_IOC32_WAIT_FOR_READONLY:
288288
cmd = EXT4_IOC_WAIT_FOR_READONLY;
289289
break;

‎fs/jbd2/journal.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
528528
{
529529
int err = 0;
530530

531-
#ifdef CONFIG_JBD_DEBUG
531+
#ifdef CONFIG_JBD2_DEBUG
532532
spin_lock(&journal->j_state_lock);
533533
if (!tid_geq(journal->j_commit_request, tid)) {
534534
printk(KERN_EMERG
@@ -1709,7 +1709,7 @@ void jbd2_slab_free(void *ptr, size_t size)
17091709
* Journal_head storage management
17101710
*/
17111711
static struct kmem_cache *jbd2_journal_head_cache;
1712-
#ifdef CONFIG_JBD_DEBUG
1712+
#ifdef CONFIG_JBD2_DEBUG
17131713
static atomic_t nr_journal_heads = ATOMIC_INIT(0);
17141714
#endif
17151715

@@ -1747,7 +1747,7 @@ static struct journal_head *journal_alloc_journal_head(void)
17471747
struct journal_head *ret;
17481748
static unsigned long last_warning;
17491749

1750-
#ifdef CONFIG_JBD_DEBUG
1750+
#ifdef CONFIG_JBD2_DEBUG
17511751
atomic_inc(&nr_journal_heads);
17521752
#endif
17531753
ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
@@ -1768,7 +1768,7 @@ static struct journal_head *journal_alloc_journal_head(void)
17681768

17691769
static void journal_free_journal_head(struct journal_head *jh)
17701770
{
1771-
#ifdef CONFIG_JBD_DEBUG
1771+
#ifdef CONFIG_JBD2_DEBUG
17721772
atomic_dec(&nr_journal_heads);
17731773
memset(jh, JBD_POISON_FREE, sizeof(*jh));
17741774
#endif
@@ -1953,12 +1953,12 @@ void jbd2_journal_put_journal_head(struct journal_head *jh)
19531953
/*
19541954
* /proc tunables
19551955
*/
1956-
#if defined(CONFIG_JBD_DEBUG)
1956+
#if defined(CONFIG_JBD2_DEBUG)
19571957
int jbd2_journal_enable_debug;
19581958
EXPORT_SYMBOL(jbd2_journal_enable_debug);
19591959
#endif
19601960

1961-
#if defined(CONFIG_JBD_DEBUG) && defined(CONFIG_PROC_FS)
1961+
#if defined(CONFIG_JBD2_DEBUG) && defined(CONFIG_PROC_FS)
19621962

19631963
static struct proc_dir_entry *proc_jbd_debug;
19641964

@@ -2073,7 +2073,7 @@ static int __init journal_init(void)
20732073

20742074
static void __exit journal_exit(void)
20752075
{
2076-
#ifdef CONFIG_JBD_DEBUG
2076+
#ifdef CONFIG_JBD2_DEBUG
20772077
int n = atomic_read(&nr_journal_heads);
20782078
if (n)
20792079
printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);

‎fs/jbd2/recovery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ int jbd2_journal_skip_recovery(journal_t *journal)
295295
printk(KERN_ERR "JBD: error %d scanning journal\n", err);
296296
++journal->j_transaction_sequence;
297297
} else {
298-
#ifdef CONFIG_JBD_DEBUG
298+
#ifdef CONFIG_JBD2_DEBUG
299299
int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence);
300300
#endif
301301
jbd_debug(0,

‎include/linux/ext4_fs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ struct ext4_new_group_data {
243243
#define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input)
244244
#define EXT4_IOC_GETVERSION_OLD FS_IOC_GETVERSION
245245
#define EXT4_IOC_SETVERSION_OLD FS_IOC_SETVERSION
246-
#ifdef CONFIG_JBD_DEBUG
246+
#ifdef CONFIG_JBD2_DEBUG
247247
#define EXT4_IOC_WAIT_FOR_READONLY _IOR('f', 99, long)
248248
#endif
249249
#define EXT4_IOC_GETRSVSZ _IOR('f', 5, long)
@@ -259,7 +259,7 @@ struct ext4_new_group_data {
259259
#define EXT4_IOC32_GETRSVSZ _IOR('f', 5, int)
260260
#define EXT4_IOC32_SETRSVSZ _IOW('f', 6, int)
261261
#define EXT4_IOC32_GROUP_EXTEND _IOW('f', 7, unsigned int)
262-
#ifdef CONFIG_JBD_DEBUG
262+
#ifdef CONFIG_JBD2_DEBUG
263263
#define EXT4_IOC32_WAIT_FOR_READONLY _IOR('f', 99, int)
264264
#endif
265265
#define EXT4_IOC32_GETVERSION_OLD FS_IOC32_GETVERSION

‎include/linux/ext4_fs_sb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ struct ext4_sb_info {
7373
struct list_head s_orphan;
7474
unsigned long s_commit_interval;
7575
struct block_device *journal_bdev;
76-
#ifdef CONFIG_JBD_DEBUG
76+
#ifdef CONFIG_JBD2_DEBUG
7777
struct timer_list turn_ro_timer; /* For turning read-only (crash simulation) */
7878
wait_queue_head_t ro_wait_queue; /* For people waiting for the fs to go read-only */
7979
#endif

‎include/linux/jbd2.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
*/
5151
#define JBD_DEFAULT_MAX_COMMIT_AGE 5
5252

53-
#ifdef CONFIG_JBD_DEBUG
53+
#ifdef CONFIG_JBD2_DEBUG
5454
/*
5555
* Define JBD_EXPENSIVE_CHECKING to enable more expensive internal
5656
* consistency checks. By default we don't do this unless
57-
* CONFIG_JBD_DEBUG is on.
57+
* CONFIG_JBD2_DEBUG is on.
5858
*/
5959
#define JBD_EXPENSIVE_CHECKING
6060
extern int jbd2_journal_enable_debug;

0 commit comments

Comments
 (0)