Commit cd02ff0b authored by Mingming Cao's avatar Mingming Cao Committed by Theodore Ts'o
Browse files

jbd2: JBD_XXX to JBD2_XXX naming cleanup 



change JBD_XXX macros to JBD2_XXX in JBD2/Ext4

Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent d802ffa8

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/fs.h>

#include <linux/time.h>

#include <linux/ext4_jbd2.h>

#include <linux/jbd.h>

#include <linux/jbd2.h>

#include <linux/highuid.h>

#include <linux/pagemap.h>

#include <linux/quotaops.h>

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1037,7 +1037,7 @@ static int parse_options (char *options, struct super_block *sb, 
			if (option < 0)

				return 0;

			if (option == 0)

				option = JBD_DEFAULT_MAX_COMMIT_AGE;

				option = JBD2_DEFAULT_MAX_COMMIT_AGE;

			sbi->s_commit_interval = HZ * option;

			break;

		case Opt_data_journal:

fs/jbd2/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag, 
				   unsigned long long block)

{

	tag->t_blocknr = cpu_to_be32(block & (u32)~0);

	if (tag_bytes > JBD_TAG_SIZE32)

	if (tag_bytes > JBD2_TAG_SIZE32)

		tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1);

}

fs/jbd2/journal.c

+4 −4
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static journal_t * journal_init_common (void) 
	spin_lock_init(&journal->j_list_lock);

	spin_lock_init(&journal->j_state_lock);



	journal->j_commit_interval = (HZ * JBD_DEFAULT_MAX_COMMIT_AGE);

	journal->j_commit_interval = (HZ * JBD2_DEFAULT_MAX_COMMIT_AGE);



	/* The journal is marked for error until we succeed with recovery! */

	journal->j_flags = JBD2_ABORT;
@@ -1612,9 +1612,9 @@ int jbd2_journal_blocks_per_page(struct inode *inode) 
size_t journal_tag_bytes(journal_t *journal)

{

	if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT))

		return JBD_TAG_SIZE64;

		return JBD2_TAG_SIZE64;

	else

		return JBD_TAG_SIZE32;

		return JBD2_TAG_SIZE32;

}



/*
@@ -1681,7 +1681,7 @@ static void journal_free_journal_head(struct journal_head *jh) 
{

#ifdef CONFIG_JBD2_DEBUG

	atomic_dec(&nr_journal_heads);

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

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

#endif

	kmem_cache_free(jbd2_journal_head_cache, jh);

}

fs/jbd2/recovery.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ int jbd2_journal_skip_recovery(journal_t *journal) 
static inline unsigned long long read_tag_block(int tag_bytes, journal_block_tag_t *tag)

{

	unsigned long long block = be32_to_cpu(tag->t_blocknr);

	if (tag_bytes > JBD_TAG_SIZE32)

	if (tag_bytes > JBD2_TAG_SIZE32)

		block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32;

	return block;

}