diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ext4_jbd2.h | 6 | ||||
-rw-r--r-- | include/linux/jbd2.h | 30 | ||||
-rw-r--r-- | include/linux/poison.h | 3 |
3 files changed, 20 insertions, 19 deletions
diff --git a/include/linux/ext4_jbd2.h b/include/linux/ext4_jbd2.h index d716e6392cf6..38c71d3c8dbf 100644 --- a/include/linux/ext4_jbd2.h +++ b/include/linux/ext4_jbd2.h | |||
@@ -12,8 +12,8 @@ | |||
12 | * Ext4-specific journaling extensions. | 12 | * Ext4-specific journaling extensions. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #ifndef _LINUX_EXT4_JBD_H | 15 | #ifndef _LINUX_EXT4_JBD2_H |
16 | #define _LINUX_EXT4_JBD_H | 16 | #define _LINUX_EXT4_JBD2_H |
17 | 17 | ||
18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
19 | #include <linux/jbd2.h> | 19 | #include <linux/jbd2.h> |
@@ -228,4 +228,4 @@ static inline int ext4_should_writeback_data(struct inode *inode) | |||
228 | return 0; | 228 | return 0; |
229 | } | 229 | } |
230 | 230 | ||
231 | #endif /* _LINUX_EXT4_JBD_H */ | 231 | #endif /* _LINUX_EXT4_JBD2_H */ |
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 5f8b876c6677..06ef11457051 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h | |||
@@ -13,8 +13,8 @@ | |||
13 | * filesystem journaling support. | 13 | * filesystem journaling support. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | #ifndef _LINUX_JBD_H | 16 | #ifndef _LINUX_JBD2_H |
17 | #define _LINUX_JBD_H | 17 | #define _LINUX_JBD2_H |
18 | 18 | ||
19 | /* Allow this file to be included directly into e2fsprogs */ | 19 | /* Allow this file to be included directly into e2fsprogs */ |
20 | #ifndef __KERNEL__ | 20 | #ifndef __KERNEL__ |
@@ -37,26 +37,26 @@ | |||
37 | #define journal_oom_retry 1 | 37 | #define journal_oom_retry 1 |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Define JBD_PARANIOD_IOFAIL to cause a kernel BUG() if ext3 finds | 40 | * Define JBD2_PARANIOD_IOFAIL to cause a kernel BUG() if ext4 finds |
41 | * certain classes of error which can occur due to failed IOs. Under | 41 | * certain classes of error which can occur due to failed IOs. Under |
42 | * normal use we want ext3 to continue after such errors, because | 42 | * normal use we want ext4 to continue after such errors, because |
43 | * hardware _can_ fail, but for debugging purposes when running tests on | 43 | * hardware _can_ fail, but for debugging purposes when running tests on |
44 | * known-good hardware we may want to trap these errors. | 44 | * known-good hardware we may want to trap these errors. |
45 | */ | 45 | */ |
46 | #undef JBD_PARANOID_IOFAIL | 46 | #undef JBD2_PARANOID_IOFAIL |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * The default maximum commit age, in seconds. | 49 | * The default maximum commit age, in seconds. |
50 | */ | 50 | */ |
51 | #define JBD_DEFAULT_MAX_COMMIT_AGE 5 | 51 | #define JBD2_DEFAULT_MAX_COMMIT_AGE 5 |
52 | 52 | ||
53 | #ifdef CONFIG_JBD2_DEBUG | 53 | #ifdef CONFIG_JBD2_DEBUG |
54 | /* | 54 | /* |
55 | * Define JBD_EXPENSIVE_CHECKING to enable more expensive internal | 55 | * Define JBD2_EXPENSIVE_CHECKING to enable more expensive internal |
56 | * consistency checks. By default we don't do this unless | 56 | * consistency checks. By default we don't do this unless |
57 | * CONFIG_JBD2_DEBUG is on. | 57 | * CONFIG_JBD2_DEBUG is on. |
58 | */ | 58 | */ |
59 | #define JBD_EXPENSIVE_CHECKING | 59 | #define JBD2_EXPENSIVE_CHECKING |
60 | extern u8 jbd2_journal_enable_debug; | 60 | extern u8 jbd2_journal_enable_debug; |
61 | 61 | ||
62 | #define jbd_debug(n, f, a...) \ | 62 | #define jbd_debug(n, f, a...) \ |
@@ -163,8 +163,8 @@ typedef struct journal_block_tag_s | |||
163 | __be32 t_blocknr_high; /* most-significant high 32bits. */ | 163 | __be32 t_blocknr_high; /* most-significant high 32bits. */ |
164 | } journal_block_tag_t; | 164 | } journal_block_tag_t; |
165 | 165 | ||
166 | #define JBD_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high)) | 166 | #define JBD2_TAG_SIZE32 (offsetof(journal_block_tag_t, t_blocknr_high)) |
167 | #define JBD_TAG_SIZE64 (sizeof(journal_block_tag_t)) | 167 | #define JBD2_TAG_SIZE64 (sizeof(journal_block_tag_t)) |
168 | 168 | ||
169 | /* | 169 | /* |
170 | * The revoke descriptor: used on disk to describe a series of blocks to | 170 | * The revoke descriptor: used on disk to describe a series of blocks to |
@@ -256,8 +256,8 @@ typedef struct journal_superblock_s | |||
256 | #include <linux/fs.h> | 256 | #include <linux/fs.h> |
257 | #include <linux/sched.h> | 257 | #include <linux/sched.h> |
258 | 258 | ||
259 | #define JBD_ASSERTIONS | 259 | #define JBD2_ASSERTIONS |
260 | #ifdef JBD_ASSERTIONS | 260 | #ifdef JBD2_ASSERTIONS |
261 | #define J_ASSERT(assert) \ | 261 | #define J_ASSERT(assert) \ |
262 | do { \ | 262 | do { \ |
263 | if (!(assert)) { \ | 263 | if (!(assert)) { \ |
@@ -284,9 +284,9 @@ void buffer_assertion_failure(struct buffer_head *bh); | |||
284 | 284 | ||
285 | #else | 285 | #else |
286 | #define J_ASSERT(assert) do { } while (0) | 286 | #define J_ASSERT(assert) do { } while (0) |
287 | #endif /* JBD_ASSERTIONS */ | 287 | #endif /* JBD2_ASSERTIONS */ |
288 | 288 | ||
289 | #if defined(JBD_PARANOID_IOFAIL) | 289 | #if defined(JBD2_PARANOID_IOFAIL) |
290 | #define J_EXPECT(expr, why...) J_ASSERT(expr) | 290 | #define J_EXPECT(expr, why...) J_ASSERT(expr) |
291 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) | 291 | #define J_EXPECT_BH(bh, expr, why...) J_ASSERT_BH(bh, expr) |
292 | #define J_EXPECT_JH(jh, expr, why...) J_ASSERT_JH(jh, expr) | 292 | #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 | 1104 | ||
1105 | #endif /* __KERNEL__ */ | 1105 | #endif /* __KERNEL__ */ |
1106 | 1106 | ||
1107 | #endif /* _LINUX_JBD_H */ | 1107 | #endif /* _LINUX_JBD2_H */ |
diff --git a/include/linux/poison.h b/include/linux/poison.h index d93c300a3449..a9c31be7052c 100644 --- a/include/linux/poison.h +++ b/include/linux/poison.h | |||
@@ -36,7 +36,8 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | /********** fs/jbd/journal.c **********/ | 38 | /********** fs/jbd/journal.c **********/ |
39 | #define JBD_POISON_FREE 0x5b | 39 | #define JBD_POISON_FREE 0x5b |
40 | #define JBD2_POISON_FREE 0x5c | ||
40 | 41 | ||
41 | /********** drivers/base/dmapool.c **********/ | 42 | /********** drivers/base/dmapool.c **********/ |
42 | #define POOL_POISON_FREED 0xa7 /* !inuse */ | 43 | #define POOL_POISON_FREED 0xa7 /* !inuse */ |