summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2001-03-29 18:18:55 +0000
committerTheodore Ts'o <tytso@mit.edu>2001-03-29 18:18:55 +0000
commit8bc85c0dab0770109e3a2c3606184778d957c74e (patch)
treede8517bc2b9e0348829f048eee1f312777a1852e /include
parent2537b6d0c1aa9710a05cdfafc281b4884c67bdb2 (diff)
downloade2fsprogs-8bc85c0dab0770109e3a2c3606184778d957c74e.tar.gz
jfs.h:
Update to synchronize with 0.6b version of jfs.h
Diffstat (limited to 'include')
-rw-r--r--include/linux/jfs.h31
1 files changed, 17 insertions, 14 deletions
diff --git a/include/linux/jfs.h b/include/linux/jfs.h
index a2e214d2..e332962f 100644
--- a/include/linux/jfs.h
+++ b/include/linux/jfs.h
@@ -26,6 +26,8 @@
*/
#ifdef __KERNEL__
#define JFS_DEBUG
+#else
+#define JFS_DEBUG
#endif
extern int journal_enable_debug;
@@ -576,6 +578,7 @@ extern int journal_set_features
extern int journal_create (journal_t *);
extern int journal_load (journal_t *);
extern void journal_release (journal_t *);
+extern int journal_recover (journal_t *);
extern int journal_wipe (journal_t *, int);
extern int journal_skip_recovery (journal_t *);
extern void journal_update_superblock (journal_t *, int);
@@ -587,10 +590,16 @@ extern int journal_clear_err (journal_t *);
/* Primary revoke support */
#define JOURNAL_REVOKE_DEFAULT_HASH 256
+extern int journal_init_revoke(journal_t *, int);
+extern void journal_destroy_revoke(journal_t *);
extern int journal_revoke (handle_t *, unsigned long, struct buffer_head *);
extern void journal_cancel_revoke(handle_t *, struct buffer_head *);
extern void journal_write_revoke_records(journal_t *, transaction_t *);
+/* Recovery revoke support */
+extern int journal_set_revoke(journal_t *, unsigned long, tid_t);
+extern int journal_test_revoke(journal_t *, unsigned long, tid_t);
+extern void journal_clear_revoke(journal_t *);
/* The log thread user interface:
@@ -635,7 +644,7 @@ static inline int is_journal_abort(journal_t *journal)
/* Not all architectures define BUG() */
#ifndef BUG
-# define BUG() do { \
+ #define BUG() do { \
printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
* ((char *) 0) = 0; \
} while (0)
@@ -643,19 +652,6 @@ static inline int is_journal_abort(journal_t *journal)
#endif /* __KERNEL__ */
-/* Function prototypes, used by both user- and kernel- space */
-
-/* recovery.c */
-extern int journal_recover (journal_t *);
-
-/* revoke.c */
-extern int journal_init_revoke(journal_t *, int);
-extern int journal_set_revoke(journal_t *, unsigned long, tid_t);
-extern int journal_test_revoke(journal_t *, unsigned long, tid_t);
-extern void journal_clear_revoke(journal_t *);
-extern void journal_destroy_revoke(journal_t *);
-
-
/* Comparison functions for transaction IDs: perform comparisons using
* modulo arithmetic so that they work over sequence number wraps. */
@@ -672,4 +668,11 @@ static inline int tid_geq(tid_t x, tid_t y)
}
+extern inline void mark_buffer_jdirty(struct buffer_head * bh)
+{
+ if (!test_and_set_bit(BH_JDirty, &bh->b_state))
+ set_writetime(bh, 0);
+}
+
+
#endif /* _LINUX_JFS_H */