Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e23291b9 authored by Jose R. Santos's avatar Jose R. Santos Committed by Theodore Ts'o
Browse files

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: default avatarJose R. Santos <jrs@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent eb40a09c

fs/ext4/balloc.c

+2 −2
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, 
		/*

		 * An HJ special.  This is expensive...

		 */

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

		jbd_unlock_bh_state(bitmap_bh);

		{

			struct buffer_head *debug_bh;
@@ -1597,7 +1597,7 @@ ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, 


	performed_allocation = 1;



#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	{

		struct buffer_head *debug_bh;

fs/ext4/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd, 
		ext4_journal_stop(handle);

		return err;

	}

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	case EXT4_IOC_WAIT_FOR_READONLY:

		/*

		 * 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) 
	case EXT4_IOC32_SETVERSION_OLD:

		cmd = EXT4_IOC_SETVERSION_OLD;

		break;

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	case EXT4_IOC32_WAIT_FOR_READONLY:

		cmd = EXT4_IOC_WAIT_FOR_READONLY;

		break;

fs/jbd2/journal.c

+7 −7
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid) 
{

	int err = 0;



#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	spin_lock(&journal->j_state_lock);

	if (!tid_geq(journal->j_commit_request, tid)) {

		printk(KERN_EMERG
@@ -1709,7 +1709,7 @@ void jbd2_slab_free(void *ptr, size_t size) 
 * Journal_head storage management

 */

static struct kmem_cache *jbd2_journal_head_cache;

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

static atomic_t nr_journal_heads = ATOMIC_INIT(0);

#endif
@@ -1747,7 +1747,7 @@ static struct journal_head *journal_alloc_journal_head(void) 
	struct journal_head *ret;

	static unsigned long last_warning;



#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	atomic_inc(&nr_journal_heads);

#endif

	ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
@@ -1768,7 +1768,7 @@ static struct journal_head *journal_alloc_journal_head(void) 


static void journal_free_journal_head(struct journal_head *jh)

{

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	atomic_dec(&nr_journal_heads);

	memset(jh, JBD_POISON_FREE, sizeof(*jh));

#endif
@@ -1953,12 +1953,12 @@ void jbd2_journal_put_journal_head(struct journal_head *jh) 
/*

 * /proc tunables

 */

#if defined(CONFIG_JBD_DEBUG)

#if defined(CONFIG_JBD2_DEBUG)

int jbd2_journal_enable_debug;

EXPORT_SYMBOL(jbd2_journal_enable_debug);

#endif



#if defined(CONFIG_JBD_DEBUG) && defined(CONFIG_PROC_FS)

#if defined(CONFIG_JBD2_DEBUG) && defined(CONFIG_PROC_FS)



static struct proc_dir_entry *proc_jbd_debug;
@@ -2073,7 +2073,7 @@ static int __init journal_init(void) 


static void __exit journal_exit(void)

{

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

	int n = atomic_read(&nr_journal_heads);

	if (n)

		printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);

fs/jbd2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ int jbd2_journal_skip_recovery(journal_t *journal) 
		printk(KERN_ERR "JBD: error %d scanning journal\n", err);

		++journal->j_transaction_sequence;

	} else {

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

		int dropped = info.end_transaction - be32_to_cpu(sb->s_sequence);

#endif

		jbd_debug(0,

include/linux/ext4_fs.h

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ struct ext4_new_group_data { 
#define EXT4_IOC_GROUP_ADD		_IOW('f', 8,struct ext4_new_group_input)

#define	EXT4_IOC_GETVERSION_OLD		FS_IOC_GETVERSION

#define	EXT4_IOC_SETVERSION_OLD		FS_IOC_SETVERSION

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

#define EXT4_IOC_WAIT_FOR_READONLY	_IOR('f', 99, long)

#endif

#define EXT4_IOC_GETRSVSZ		_IOR('f', 5, long)
@@ -259,7 +259,7 @@ struct ext4_new_group_data { 
#define EXT4_IOC32_GETRSVSZ		_IOR('f', 5, int)

#define EXT4_IOC32_SETRSVSZ		_IOW('f', 6, int)

#define EXT4_IOC32_GROUP_EXTEND		_IOW('f', 7, unsigned int)

#ifdef CONFIG_JBD_DEBUG

#ifdef CONFIG_JBD2_DEBUG

#define EXT4_IOC32_WAIT_FOR_READONLY	_IOR('f', 99, int)

#endif

#define EXT4_IOC32_GETVERSION_OLD	FS_IOC32_GETVERSION