summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2007-10-17 00:38:25 +0200
committerTheodore Ts'o <tytso@mit.edu>2007-10-18 00:49:58 +0200
commitcd02ff0b14b7e27cbdfd7ff2814b08199a2b7168 (patch)
treefd9158bb92d086838a1b81b549243f3cdc23a7b8 /fs/ext4
parentJBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4 (diff)
downloadlinux-cd02ff0b14b7e27cbdfd7ff2814b08199a2b7168.tar.xz
linux-cd02ff0b14b7e27cbdfd7ff2814b08199a2b7168.zip
jbd2: JBD_XXX to JBD2_XXX naming cleanup
change JBD_XXX macros to JBD2_XXX in JBD2/Ext4 Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/extents.c2
-rw-r--r--fs/ext4/super.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index 78beb096f57d..2be404f68a76 100644
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -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>
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4c8d31c61454..83f9cd358e5a 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -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: