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

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
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/ext4_jbd2.h> #include <linux/ext4_jbd2.h>
#include <linux/jbd.h> #include <linux/jbd2.h>
#include <linux/highuid.h> #include <linux/highuid.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/quotaops.h> #include <linux/quotaops.h>
......
...@@ -1037,7 +1037,7 @@ static int parse_options (char *options, struct super_block *sb, ...@@ -1037,7 +1037,7 @@ static int parse_options (char *options, struct super_block *sb,
if (option < 0) if (option < 0)
return 0; return 0;
if (option == 0) if (option == 0)
option = JBD_DEFAULT_MAX_COMMIT_AGE; option = JBD2_DEFAULT_MAX_COMMIT_AGE;
sbi->s_commit_interval = HZ * option; sbi->s_commit_interval = HZ * option;
break; break;
case Opt_data_journal: case Opt_data_journal:
......
...@@ -278,7 +278,7 @@ static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag, ...@@ -278,7 +278,7 @@ static inline void write_tag_block(int tag_bytes, journal_block_tag_t *tag,
unsigned long long block) unsigned long long block)
{ {
tag->t_blocknr = cpu_to_be32(block & (u32)~0); 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); tag->t_blocknr_high = cpu_to_be32((block >> 31) >> 1);
} }
......
...@@ -670,7 +670,7 @@ static journal_t * journal_init_common (void) ...@@ -670,7 +670,7 @@ static journal_t * journal_init_common (void)
spin_lock_init(&journal->j_list_lock); spin_lock_init(&journal->j_list_lock);
spin_lock_init(&journal->j_state_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! */ /* The journal is marked for error until we succeed with recovery! */
journal->j_flags = JBD2_ABORT; journal->j_flags = JBD2_ABORT;
...@@ -1612,9 +1612,9 @@ int jbd2_journal_blocks_per_page(struct inode *inode) ...@@ -1612,9 +1612,9 @@ int jbd2_journal_blocks_per_page(struct inode *inode)
size_t journal_tag_bytes(journal_t *journal) size_t journal_tag_bytes(journal_t *journal)
{ {
if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT)) if (JBD2_HAS_INCOMPAT_FEATURE(journal, JBD2_FEATURE_INCOMPAT_64BIT))
return JBD_TAG_SIZE64; return JBD2_TAG_SIZE64;
else else
return JBD_TAG_SIZE32; return JBD2_TAG_SIZE32;
} }
/* /*
...@@ -1681,7 +1681,7 @@ static void journal_free_journal_head(struct journal_head *jh) ...@@ -1681,7 +1681,7 @@ static void journal_free_journal_head(struct journal_head *jh)
{ {
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
atomic_dec(&nr_journal_heads); atomic_dec(&nr_journal_heads);
memset(jh, JBD_POISON_FREE, sizeof(*jh)); memset(jh, JBD2_POISON_FREE, sizeof(*jh));
#endif #endif
kmem_cache_free(jbd2_journal_head_cache, jh); kmem_cache_free(jbd2_journal_head_cache, jh);
} }
......
...@@ -311,7 +311,7 @@ int jbd2_journal_skip_recovery(journal_t *journal) ...@@ -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) 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); 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; block |= (u64)be32_to_cpu(tag->t_blocknr_high) << 32;
return block; return block;
} }
......
...@@ -352,7 +352,7 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr, ...@@ -352,7 +352,7 @@ int jbd2_journal_revoke(handle_t *handle, unsigned long long blocknr,
if (bh) if (bh)
BUFFER_TRACE(bh, "found on hash"); BUFFER_TRACE(bh, "found on hash");
} }
#ifdef JBD_EXPENSIVE_CHECKING #ifdef JBD2_EXPENSIVE_CHECKING
else { else {
struct buffer_head *bh2; struct buffer_head *bh2;
...@@ -453,7 +453,7 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh) ...@@ -453,7 +453,7 @@ int jbd2_journal_cancel_revoke(handle_t *handle, struct journal_head *jh)
} }
} }
#ifdef JBD_EXPENSIVE_CHECKING #ifdef JBD2_EXPENSIVE_CHECKING
/* There better not be one left behind by now! */ /* There better not be one left behind by now! */
record = find_revoke_record(journal, bh->b_blocknr); record = find_revoke_record(journal, bh->b_blocknr);
J_ASSERT_JH(jh, record == NULL); J_ASSERT_JH(jh, record == NULL);
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
* Ext4-specific journaling extensions. * Ext4-specific journaling extensions.
*/ */
#ifndef _LINUX_EXT4_JBD_H #ifndef _LINUX_EXT4_JBD2_H
#define _LINUX_EXT4_JBD_H #define _LINUX_EXT4_JBD2_H
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/jbd2.h> #include <linux/jbd2.h>
...@@ -228,4 +228,4 @@ static inline int ext4_should_writeback_data(struct inode *inode) ...@@ -228,4 +228,4 @@ static inline int ext4_should_writeback_data(struct inode *inode)
return 0; return 0;
} }
#endif /* _LINUX_EXT4_JBD_H */ #endif /* _LINUX_EXT4_JBD2_H */
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* filesystem journaling support. * filesystem journaling support.
*/ */
#ifndef _LINUX_JBD_H #ifndef _LINUX_JBD2_H
#define _LINUX_JBD_H #define _LINUX_JBD2_H
/* Allow this file to be included directly into e2fsprogs */ /* Allow this file to be included directly into e2fsprogs */
#ifndef __KERNEL__ #ifndef __KERNEL__
...@@ -37,26 +37,26 @@ ...@@ -37,26 +37,26 @@
#define journal_oom_retry 1 #define journal_oom_retry 1
/* /*
* Define JBD_PARANIOD_IOFAIL to cause a kernel BUG() if ext3 finds * Define JBD2_PARANIOD_IOFAIL to cause a kernel BUG() if ext4 finds
* certain classes of error which can occur due to failed IOs. Under * certain classes of error which can occur due to failed IOs. Under
* normal use we want ext3 to continue after such errors, because * normal use we want ext4 to continue after such errors, because
* hardware _can_ fail, but for debugging purposes when running tests on * hardware _can_ fail, but for debugging purposes when running tests on
* known-good hardware we may want to trap these errors. * known-good hardware we may want to trap these errors.
*/ */
#undef JBD_PARANOID_IOFAIL #undef JBD2_PARANOID_IOFAIL
/* /*
* The default maximum commit age, in seconds. * The default maximum commit age, in seconds.
*/ */
#define JBD_DEFAULT_MAX_COMMIT_AGE 5 #define JBD2_DEFAULT_MAX_COMMIT_AGE 5
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
/* /*
* Define JBD_EXPENSIVE_CHECKING to enable more expensive internal * Define JBD2_EXPENSIVE_CHECKING to enable more expensive internal
* consistency checks. By default we don't do this unless * consistency checks. By default we don't do this unless
* CONFIG_JBD2_DEBUG is on. * CONFIG_JBD2_DEBUG is on.
*/ */
#define JBD_EXPENSIVE_CHECKING #define JBD2_EXPENSIVE_CHECKING
extern u8 jbd2_journal_enable_debug; extern u8 jbd2_journal_enable_debug;
#define jbd_debug(n, f, a...) \ #define jbd_debug(n, f, a...) \
...@@ -163,8 +163,8 @@ typedef struct journal_block_tag_s ...@@ -163,8 +163,8 @@ typedef struct journal_block_tag_s
__be32 t_blocknr_high; /* most-significant high 32bits. */ __be32 t_blocknr_high; /* most-significant high 32bits. */
} journal_block_tag_t; } journal_block_tag_t;
#define JBD_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high)) #define JBD2_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high))
#define JBD_TAG_SIZE64 (sizeof(journal_block_tag_t)) #define JBD2_TAG_SIZE64 (sizeof(journal_block_tag_t))
/* /*
* The revoke descriptor: used on disk to describe a series of blocks to * The revoke descriptor: used on disk to describe a series of blocks to
...@@ -256,8 +256,8 @@ typedef struct journal_superblock_s ...@@ -256,8 +256,8 @@ typedef struct journal_superblock_s
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/sched.h> #include <linux/sched.h>
#define JBD_ASSERTIONS #define JBD2_ASSERTIONS
#ifdef JBD_ASSERTIONS #ifdef JBD2_ASSERTIONS
#define J_ASSERT(assert) \ #define J_ASSERT(assert) \
do { \ do { \
if (!(assert)) { \ if (!(assert)) { \
...@@ -284,9 +284,9 @@ void buffer_assertion_failure(struct buffer_head *bh); ...@@ -284,9 +284,9 @@ void buffer_assertion_failure(struct buffer_head *bh);
#else #else
#define J_ASSERT(assert) do { } while (0) #define J_ASSERT(assert) do { } while (0)
#endif /* JBD_ASSERTIONS */ #endif /* JBD2_ASSERTIONS */
#if defined(JBD_PARANOID_IOFAIL) #if defined(JBD2_PARANOID_IOFAIL)
#define J_EXPECT(expr, why...) J_ASSERT(expr) #define J_EXPECT(expr, why...) J_ASSERT(expr)
#define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr)
#define J_EXPECT_JH(jh, expr, why...) J_ASSERT_JH(jh, expr) #define J_EXPECT_JH(jh, expr, why...) J_ASSERT_JH(jh, expr)
...@@ -1104,4 +1104,4 @@ extern int jbd_blocks_per_page(struct inode *inode); ...@@ -1104,4 +1104,4 @@ extern int jbd_blocks_per_page(struct inode *inode);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _LINUX_JBD_H */ #endif /* _LINUX_JBD2_H */
...@@ -36,7 +36,8 @@ ...@@ -36,7 +36,8 @@
*/ */
/********** fs/jbd/journal.c **********/ /********** fs/jbd/journal.c **********/
#define JBD_POISON_FREE 0x5b #define JBD_POISON_FREE 0x5b
#define JBD2_POISON_FREE 0x5c
/********** drivers/base/dmapool.c **********/ /********** drivers/base/dmapool.c **********/
#define POOL_POISON_FREED 0xa7 /* !inuse */ #define POOL_POISON_FREED 0xa7 /* !inuse */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment