summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@zip.com.au>2002-05-27 05:14:22 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-05-27 05:14:22 -0700
commit28ea30f77159408767ca45b7e0976abc5fbf062b (patch)
treef635a8bb468ae7e4d75fc2d6b0ed6b2c7c785729
parentca9272212f988b006d3db5ee594767aeca5e3c67 (diff)
[PATCH] move BH_JBD out of buffer_head.h
For historical reasons, ext3 has a private BH state bit which has global scope. This patch moves it inside ext3.
-rw-r--r--include/linux/buffer_head.h1
-rw-r--r--include/linux/jbd.h13
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 402a3af8c41e..9bcb2b34df84 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -23,7 +23,6 @@ enum bh_state_bits {
BH_Async_Read, /* Is under end_buffer_async_read I/O */
BH_Async_Write, /* Is under end_buffer_async_write I/O */
- BH_JBD, /* Has an attached ext3 journal_head */
BH_Boundary, /* Block is followed by a discontiguity */
BH_PrivateStart,/* not a state bit, but the first bit available
* for private allocation by other entities
diff --git a/include/linux/jbd.h b/include/linux/jbd.h
index a1a654e1567c..d0c52537a274 100644
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
@@ -226,12 +226,13 @@ void buffer_assertion_failure(struct buffer_head *bh);
#endif /* JBD_ASSERTIONS */
enum jbd_state_bits {
- BH_JWrite
- = BH_PrivateStart, /* 1 if being written to log (@@@ DEBUGGING) */
- BH_Freed, /* 1 if buffer has been freed (truncated) */
- BH_Revoked, /* 1 if buffer has been revoked from the log */
- BH_RevokeValid, /* 1 if buffer revoked flag is valid */
- BH_JBDDirty, /* 1 if buffer is dirty but journaled */
+ BH_JBD /* Has an attached ext3 journal_head */
+ = BH_PrivateStart,
+ BH_JWrite, /* Being written to log (@@@ DEBUGGING) */
+ BH_Freed, /* Has been freed (truncated) */
+ BH_Revoked, /* Has been revoked from the log */
+ BH_RevokeValid, /* Revoked flag is valid */
+ BH_JBDDirty, /* Is dirty but journaled */
};
BUFFER_FNS(JBD, jbd)