diff options
author | Theodore Ts'o <tytso@mit.edu> | 2001-03-29 19:19:24 +0000 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2001-03-29 19:19:24 +0000 |
commit | 50286ad488f04d222a4ab7949f2db11a0fbb3098 (patch) | |
tree | 8268c160d8693f249085540a1fe592586d88c354 /include | |
parent | 78eccb85b8889362f5f64fe1d1bf91f4d6ee3fc1 (diff) | |
download | android_external_e2fsprogs-50286ad488f04d222a4ab7949f2db11a0fbb3098.tar.gz android_external_e2fsprogs-50286ad488f04d222a4ab7949f2db11a0fbb3098.tar.bz2 android_external_e2fsprogs-50286ad488f04d222a4ab7949f2db11a0fbb3098.zip |
jfs.h:
Move things around so that user-mode stuff is outside #ifdef LINUX,
and stuff which is kernel-only into #ifdef LINUX. (Should be synced up
with sct).
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/jfs.h | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/include/linux/jfs.h b/include/linux/jfs.h index e332962f..c8bdb32a 100644 --- a/include/linux/jfs.h +++ b/include/linux/jfs.h @@ -578,7 +578,6 @@ 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); @@ -590,18 +589,10 @@ 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: * * Request space in the current transaction, and force transaction commit @@ -642,6 +633,13 @@ static inline int is_journal_abort(journal_t *journal) return journal->j_flags & JFS_ABORT; } + +extern inline void mark_buffer_jdirty(struct buffer_head * bh) +{ + if (!test_and_set_bit(BH_JDirty, &bh->b_state)) + set_writetime(bh, 0); +} + /* Not all architectures define BUG() */ #ifndef BUG #define BUG() do { \ @@ -652,6 +650,22 @@ 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 */ + /* Primary recovery support */ +extern int journal_init_revoke(journal_t *, int); +extern void journal_destroy_revoke(journal_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 *); + + /* Comparison functions for transaction IDs: perform comparisons using * modulo arithmetic so that they work over sequence number wraps. */ @@ -667,12 +681,4 @@ static inline int tid_geq(tid_t x, tid_t y) return (difference >= 0); } - -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 */ |