r2030 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches: . series
Andres Salomon
dilinger-guest@haydn.debian.org
Thu, 23 Dec 2004 02:05:31 -0700
Author: dilinger-guest
Date: 2004-12-23 02:05:14 -0700 (Thu, 23 Dec 2004)
New Revision: 2030
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-sucks.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
Log:
add additional reiserfs patch
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-sucks.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-sucks.dpatch 2004-12-23 09:03:11 UTC (rev 2029)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/reiserfs-sucks.dpatch 2004-12-23 09:05:14 UTC (rev 2030)
@@ -0,0 +1,1823 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: ReiserFS: Cleanup access of journal (cosmetic)
+## DP: Patch author: Jeff Mahoney <jeffm@novell.com>
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+# 2004/10/18 23:07:32-07:00 jeffm@novell.com
+# [PATCH] ReiserFS: Cleanup access of journal (cosmetic)
+#
+# This patch cleans up fs/reiserfs/journal.c such that repeated uses of
+# SB_JOURNAL(p_s_sb) are removed in favor of a local journal variable. The
+# compiler won't care, and it makes the code much easier to read.
+#
+# Signed-off-by: Jeff Mahoney <jeffm@novell.com>
+# Signed-off-by: Andrew Morton <akpm@osdl.org>
+# Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+#
+# fs/reiserfs/journal.c
+# 2004/10/18 22:28:07-07:00 jeffm@novell.com +375 -335
+# ReiserFS: Cleanup access of journal (cosmetic)
+#
+# fs/reiserfs/procfs.c
+# 2004/10/18 22:26:49-07:00 jeffm@novell.com +1 -1
+# ReiserFS: Cleanup access of journal (cosmetic)
+#
+# fs/reiserfs/super.c
+# 2004/10/18 22:28:07-07:00 jeffm@novell.com +5 -4
+# ReiserFS: Cleanup access of journal (cosmetic)
+#
+# include/linux/reiserfs_fs_sb.h
+# 2004/10/18 22:28:07-07:00 jeffm@novell.com +5 -11
+# ReiserFS: Cleanup access of journal (cosmetic)
+#
+diff -Nru a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
+--- a/fs/reiserfs/journal.c 2004-12-23 01:01:06 -08:00
++++ b/fs/reiserfs/journal.c 2004-12-23 01:01:06 -08:00
+@@ -111,7 +111,8 @@
+ static void flush_async_commits(void *p);
+
+ static void init_journal_hash(struct super_block *p_s_sb) {
+- memset(SB_JOURNAL(p_s_sb)->j_hash_table, 0, JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *)) ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
++ memset(journal->j_hash_table, 0, JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *)) ;
+ }
+
+ /*
+@@ -155,17 +156,18 @@
+
+ static struct reiserfs_bitmap_node *
+ get_bitmap_node(struct super_block *p_s_sb) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_bitmap_node *bn = NULL;
+- struct list_head *entry = SB_JOURNAL(p_s_sb)->j_bitmap_nodes.next ;
++ struct list_head *entry = journal->j_bitmap_nodes.next ;
+
+- SB_JOURNAL(p_s_sb)->j_used_bitmap_nodes++ ;
++ journal->j_used_bitmap_nodes++ ;
+ repeat:
+
+- if(entry != &SB_JOURNAL(p_s_sb)->j_bitmap_nodes) {
++ if(entry != &journal->j_bitmap_nodes) {
+ bn = list_entry(entry, struct reiserfs_bitmap_node, list) ;
+ list_del(entry) ;
+ memset(bn->data, 0, p_s_sb->s_blocksize) ;
+- SB_JOURNAL(p_s_sb)->j_free_bitmap_nodes-- ;
++ journal->j_free_bitmap_nodes-- ;
+ return bn ;
+ }
+ bn = allocate_bitmap_node(p_s_sb) ;
+@@ -177,24 +179,26 @@
+ }
+ static inline void free_bitmap_node(struct super_block *p_s_sb,
+ struct reiserfs_bitmap_node *bn) {
+- SB_JOURNAL(p_s_sb)->j_used_bitmap_nodes-- ;
+- if (SB_JOURNAL(p_s_sb)->j_free_bitmap_nodes > REISERFS_MAX_BITMAP_NODES) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
++ journal->j_used_bitmap_nodes-- ;
++ if (journal->j_free_bitmap_nodes > REISERFS_MAX_BITMAP_NODES) {
+ reiserfs_kfree(bn->data, p_s_sb->s_blocksize, p_s_sb) ;
+ reiserfs_kfree(bn, sizeof(struct reiserfs_bitmap_node), p_s_sb) ;
+ } else {
+- list_add(&bn->list, &SB_JOURNAL(p_s_sb)->j_bitmap_nodes) ;
+- SB_JOURNAL(p_s_sb)->j_free_bitmap_nodes++ ;
++ list_add(&bn->list, &journal->j_bitmap_nodes) ;
++ journal->j_free_bitmap_nodes++ ;
+ }
+ }
+
+ static void allocate_bitmap_nodes(struct super_block *p_s_sb) {
+ int i ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_bitmap_node *bn = NULL ;
+ for (i = 0 ; i < REISERFS_MIN_BITMAP_NODES ; i++) {
+ bn = allocate_bitmap_node(p_s_sb) ;
+ if (bn) {
+- list_add(&bn->list, &SB_JOURNAL(p_s_sb)->j_bitmap_nodes) ;
+- SB_JOURNAL(p_s_sb)->j_free_bitmap_nodes++ ;
++ list_add(&bn->list, &journal->j_bitmap_nodes) ;
++ journal->j_free_bitmap_nodes++ ;
+ } else {
+ break ; // this is ok, we'll try again when more are needed
+ }
+@@ -245,16 +249,17 @@
+ }
+
+ static int free_bitmap_nodes(struct super_block *p_s_sb) {
+- struct list_head *next = SB_JOURNAL(p_s_sb)->j_bitmap_nodes.next ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
++ struct list_head *next = journal->j_bitmap_nodes.next ;
+ struct reiserfs_bitmap_node *bn ;
+
+- while(next != &SB_JOURNAL(p_s_sb)->j_bitmap_nodes) {
++ while(next != &journal->j_bitmap_nodes) {
+ bn = list_entry(next, struct reiserfs_bitmap_node, list) ;
+ list_del(next) ;
+ reiserfs_kfree(bn->data, p_s_sb->s_blocksize, p_s_sb) ;
+ reiserfs_kfree(bn, sizeof(struct reiserfs_bitmap_node), p_s_sb) ;
+- next = SB_JOURNAL(p_s_sb)->j_bitmap_nodes.next ;
+- SB_JOURNAL(p_s_sb)->j_free_bitmap_nodes-- ;
++ next = journal->j_bitmap_nodes.next ;
++ journal->j_free_bitmap_nodes-- ;
+ }
+
+ return 0 ;
+@@ -297,15 +302,16 @@
+ static struct reiserfs_list_bitmap *
+ get_list_bitmap(struct super_block *p_s_sb, struct reiserfs_journal_list *jl) {
+ int i,j ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_list_bitmap *jb = NULL ;
+
+ for (j = 0 ; j < (JOURNAL_NUM_BITMAPS * 3) ; j++) {
+- i = SB_JOURNAL(p_s_sb)->j_list_bitmap_index ;
+- SB_JOURNAL(p_s_sb)->j_list_bitmap_index = (i + 1) % JOURNAL_NUM_BITMAPS ;
+- jb = SB_JOURNAL(p_s_sb)->j_list_bitmap + i ;
+- if (SB_JOURNAL(p_s_sb)->j_list_bitmap[i].journal_list) {
+- flush_commit_list(p_s_sb, SB_JOURNAL(p_s_sb)->j_list_bitmap[i].journal_list, 1) ;
+- if (!SB_JOURNAL(p_s_sb)->j_list_bitmap[i].journal_list) {
++ i = journal->j_list_bitmap_index ;
++ journal->j_list_bitmap_index = (i + 1) % JOURNAL_NUM_BITMAPS ;
++ jb = journal->j_list_bitmap + i ;
++ if (journal->j_list_bitmap[i].journal_list) {
++ flush_commit_list(p_s_sb, journal->j_list_bitmap[i].journal_list, 1) ;
++ if (!journal->j_list_bitmap[i].journal_list) {
+ break ;
+ }
+ } else {
+@@ -350,22 +356,23 @@
+ */
+ static struct reiserfs_journal_cnode *get_cnode(struct super_block *p_s_sb) {
+ struct reiserfs_journal_cnode *cn ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+
+ reiserfs_check_lock_depth(p_s_sb, "get_cnode") ;
+
+- if (SB_JOURNAL(p_s_sb)->j_cnode_free <= 0) {
++ if (journal->j_cnode_free <= 0) {
+ return NULL ;
+ }
+- SB_JOURNAL(p_s_sb)->j_cnode_used++ ;
+- SB_JOURNAL(p_s_sb)->j_cnode_free-- ;
+- cn = SB_JOURNAL(p_s_sb)->j_cnode_free_list ;
++ journal->j_cnode_used++ ;
++ journal->j_cnode_free-- ;
++ cn = journal->j_cnode_free_list ;
+ if (!cn) {
+ return cn ;
+ }
+ if (cn->next) {
+ cn->next->prev = NULL ;
+ }
+- SB_JOURNAL(p_s_sb)->j_cnode_free_list = cn->next ;
++ journal->j_cnode_free_list = cn->next ;
+ memset(cn, 0, sizeof(struct reiserfs_journal_cnode)) ;
+ return cn ;
+ }
+@@ -374,18 +381,19 @@
+ ** returns a cnode to the free list
+ */
+ static void free_cnode(struct super_block *p_s_sb, struct reiserfs_journal_cnode *cn) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+
+ reiserfs_check_lock_depth(p_s_sb, "free_cnode") ;
+
+- SB_JOURNAL(p_s_sb)->j_cnode_used-- ;
+- SB_JOURNAL(p_s_sb)->j_cnode_free++ ;
++ journal->j_cnode_used-- ;
++ journal->j_cnode_free++ ;
+ /* memset(cn, 0, sizeof(struct reiserfs_journal_cnode)) ; */
+- cn->next = SB_JOURNAL(p_s_sb)->j_cnode_free_list ;
+- if (SB_JOURNAL(p_s_sb)->j_cnode_free_list) {
+- SB_JOURNAL(p_s_sb)->j_cnode_free_list->prev = cn ;
++ cn->next = journal->j_cnode_free_list ;
++ if (journal->j_cnode_free_list) {
++ journal->j_cnode_free_list->prev = cn ;
+ }
+ cn->prev = NULL ; /* not needed with the memset, but I might kill the memset, and forget to do this */
+- SB_JOURNAL(p_s_sb)->j_cnode_free_list = cn ;
++ journal->j_cnode_free_list = cn ;
+ }
+
+ static void clear_prepared_bits(struct buffer_head *bh) {
+@@ -424,9 +432,10 @@
+
+ /* returns a cnode with same size, block number and dev as bh in the current transaction hash. NULL if not found */
+ static inline struct reiserfs_journal_cnode *get_journal_hash(struct super_block *p_s_sb, struct buffer_head *bh) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn ;
+ if (bh) {
+- cn = get_journal_hash_dev(p_s_sb, SB_JOURNAL(p_s_sb)->j_hash_table, bh->b_blocknr);
++ cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, bh->b_blocknr);
+ }
+ else {
+ return (struct reiserfs_journal_cnode *)0 ;
+@@ -455,6 +464,7 @@
+ int reiserfs_in_journal(struct super_block *p_s_sb,
+ int bmap_nr, int bit_nr, int search_all,
+ b_blocknr_t *next_zero_bit) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn ;
+ struct reiserfs_list_bitmap *jb ;
+ int i ;
+@@ -470,7 +480,7 @@
+ if (search_all) {
+ for (i = 0 ; i < JOURNAL_NUM_BITMAPS ; i++) {
+ PROC_INFO_INC( p_s_sb, journal.in_journal_bitmap );
+- jb = SB_JOURNAL(p_s_sb)->j_list_bitmap + i ;
++ jb = journal->j_list_bitmap + i ;
+ if (jb->journal_list && jb->bitmaps[bmap_nr] &&
+ test_bit(bit_nr, (unsigned long *)jb->bitmaps[bmap_nr]->data)) {
+ *next_zero_bit = find_next_zero_bit((unsigned long *)
+@@ -483,12 +493,12 @@
+
+ bl = bmap_nr * (p_s_sb->s_blocksize << 3) + bit_nr;
+ /* is it in any old transactions? */
+- if (search_all && (cn = get_journal_hash_dev(p_s_sb, SB_JOURNAL(p_s_sb)->j_list_hash_table, bl))) {
++ if (search_all && (cn = get_journal_hash_dev(p_s_sb, journal->j_list_hash_table, bl))) {
+ return 1;
+ }
+
+ /* is it in the current transaction. This should never happen */
+- if ((cn = get_journal_hash_dev(p_s_sb, SB_JOURNAL(p_s_sb)->j_hash_table, bl))) {
++ if ((cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, bl))) {
+ BUG();
+ return 1;
+ }
+@@ -557,7 +567,8 @@
+ static int journal_list_still_alive(struct super_block *s,
+ unsigned long trans_id)
+ {
+- struct list_head *entry = &SB_JOURNAL(s)->j_journal_list;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
++ struct list_head *entry = &journal->j_journal_list;
+ struct reiserfs_journal_list *jl;
+
+ if (!list_empty(entry)) {
+@@ -823,6 +834,7 @@
+ }
+
+ static int flush_older_commits(struct super_block *s, struct reiserfs_journal_list *jl) {
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+ struct reiserfs_journal_list *other_jl;
+ struct reiserfs_journal_list *first_jl;
+ struct list_head *entry;
+@@ -838,7 +850,7 @@
+ entry = jl->j_list.prev;
+ while(1) {
+ other_jl = JOURNAL_LIST_ENTRY(entry);
+- if (entry == &SB_JOURNAL(s)->j_journal_list ||
++ if (entry == &journal->j_journal_list ||
+ atomic_read(&other_jl->j_older_commits_done))
+ break;
+
+@@ -875,7 +887,7 @@
+ }
+ }
+ entry = entry->next;
+- if (entry == &SB_JOURNAL(s)->j_journal_list)
++ if (entry == &journal->j_journal_list)
+ return 0;
+ } else {
+ return 0;
+@@ -903,6 +915,7 @@
+ int bn ;
+ struct buffer_head *tbh = NULL ;
+ unsigned long trans_id = jl->j_trans_id;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+ int barrier = 0;
+
+ reiserfs_check_lock_depth(s, "flush_commit_list") ;
+@@ -916,7 +929,7 @@
+ */
+ if (jl->j_len <= 0)
+ BUG();
+- if (trans_id == SB_JOURNAL(s)->j_trans_id)
++ if (trans_id == journal->j_trans_id)
+ BUG();
+
+ get_journal_list(jl);
+@@ -947,8 +960,8 @@
+
+ if (!list_empty(&jl->j_bh_list)) {
+ unlock_kernel();
+- write_ordered_buffers(&SB_JOURNAL(s)->j_dirty_buffers_lock,
+- SB_JOURNAL(s), jl, &jl->j_bh_list);
++ write_ordered_buffers(&journal->j_dirty_buffers_lock,
++ journal, jl, &jl->j_bh_list);
+ lock_kernel();
+ }
+ if (!list_empty(&jl->j_bh_list))
+@@ -957,7 +970,7 @@
+ * for the description block and all the log blocks, submit any buffers
+ * that haven't already reached the disk
+ */
+- atomic_inc(&SB_JOURNAL(s)->j_async_throttle);
++ atomic_inc(&journal->j_async_throttle);
+ for (i = 0 ; i < (jl->j_len + 1) ; i++) {
+ bn = SB_ONDISK_JOURNAL_1st_BLOCK(s) + (jl->j_start+i) %
+ SB_ONDISK_JOURNAL_SIZE(s);
+@@ -966,7 +979,7 @@
+ ll_rw_block(WRITE, 1, &tbh) ;
+ put_bh(tbh) ;
+ }
+- atomic_dec(&SB_JOURNAL(s)->j_async_throttle);
++ atomic_dec(&journal->j_async_throttle);
+
+ /* wait on everything written so far before writing the commit
+ * if we are in barrier mode, send the commit down now
+@@ -1016,13 +1029,13 @@
+ reiserfs_panic(s, "journal-615: buffer write failed\n") ;
+ }
+ bforget(jl->j_commit_bh) ;
+- if (SB_JOURNAL(s)->j_last_commit_id != 0 &&
+- (jl->j_trans_id - SB_JOURNAL(s)->j_last_commit_id) != 1) {
++ if (journal->j_last_commit_id != 0 &&
++ (jl->j_trans_id - journal->j_last_commit_id) != 1) {
+ reiserfs_warning(s, "clm-2200: last commit %lu, current %lu",
+- SB_JOURNAL(s)->j_last_commit_id,
++ journal->j_last_commit_id,
+ jl->j_trans_id);
+ }
+- SB_JOURNAL(s)->j_last_commit_id = jl->j_trans_id;
++ journal->j_last_commit_id = jl->j_trans_id;
+
+ /* now, every commit block is on the disk. It is safe to allow blocks freed during this transaction to be reallocated */
+ cleanup_freed_for_journal_list(s, jl) ;
+@@ -1067,6 +1080,7 @@
+ ** block to be reallocated for data blocks if it had been deleted.
+ */
+ static void remove_all_from_journal_list(struct super_block *p_s_sb, struct reiserfs_journal_list *jl, int debug) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn, *last ;
+ cn = jl->j_realblock ;
+
+@@ -1080,7 +1094,7 @@
+ cn->bh ? 1: 0, cn->state) ;
+ }
+ cn->state = 0 ;
+- remove_journal_hash(p_s_sb, SB_JOURNAL(p_s_sb)->j_list_hash_table, jl, cn->blocknr, 1) ;
++ remove_journal_hash(p_s_sb, journal->j_list_hash_table, jl, cn->blocknr, 1) ;
+ }
+ last = cn ;
+ cn = cn->next ;
+@@ -1098,37 +1112,38 @@
+ */
+ static int _update_journal_header_block(struct super_block *p_s_sb, unsigned long offset, unsigned long trans_id) {
+ struct reiserfs_journal_header *jh ;
+- if (trans_id >= SB_JOURNAL(p_s_sb)->j_last_flush_trans_id) {
+- if (buffer_locked((SB_JOURNAL(p_s_sb)->j_header_bh))) {
+- wait_on_buffer((SB_JOURNAL(p_s_sb)->j_header_bh)) ;
+- if (!buffer_uptodate(SB_JOURNAL(p_s_sb)->j_header_bh)) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
++ if (trans_id >= journal->j_last_flush_trans_id) {
++ if (buffer_locked((journal->j_header_bh))) {
++ wait_on_buffer((journal->j_header_bh)) ;
++ if (!buffer_uptodate(journal->j_header_bh)) {
+ reiserfs_panic(p_s_sb, "journal-699: buffer write failed\n") ;
+ }
+ }
+- SB_JOURNAL(p_s_sb)->j_last_flush_trans_id = trans_id ;
+- SB_JOURNAL(p_s_sb)->j_first_unflushed_offset = offset ;
+- jh = (struct reiserfs_journal_header *)(SB_JOURNAL(p_s_sb)->j_header_bh->b_data) ;
++ journal->j_last_flush_trans_id = trans_id ;
++ journal->j_first_unflushed_offset = offset ;
++ jh = (struct reiserfs_journal_header *)(journal->j_header_bh->b_data) ;
+ jh->j_last_flush_trans_id = cpu_to_le32(trans_id) ;
+ jh->j_first_unflushed_offset = cpu_to_le32(offset) ;
+- jh->j_mount_id = cpu_to_le32(SB_JOURNAL(p_s_sb)->j_mount_id) ;
++ jh->j_mount_id = cpu_to_le32(journal->j_mount_id) ;
+
+ if (reiserfs_barrier_flush(p_s_sb)) {
+ int ret;
+- lock_buffer(SB_JOURNAL(p_s_sb)->j_header_bh);
+- ret = submit_barrier_buffer(SB_JOURNAL(p_s_sb)->j_header_bh);
++ lock_buffer(journal->j_header_bh);
++ ret = submit_barrier_buffer(journal->j_header_bh);
+ if (ret == -EOPNOTSUPP) {
+- set_buffer_uptodate(SB_JOURNAL(p_s_sb)->j_header_bh);
++ set_buffer_uptodate(journal->j_header_bh);
+ disable_barrier(p_s_sb);
+ goto sync;
+ }
+- wait_on_buffer(SB_JOURNAL(p_s_sb)->j_header_bh);
+- check_barrier_completion(p_s_sb, SB_JOURNAL(p_s_sb)->j_header_bh);
++ wait_on_buffer(journal->j_header_bh);
++ check_barrier_completion(p_s_sb, journal->j_header_bh);
+ } else {
+ sync:
+- set_buffer_dirty(SB_JOURNAL(p_s_sb)->j_header_bh) ;
+- sync_dirty_buffer(SB_JOURNAL(p_s_sb)->j_header_bh) ;
++ set_buffer_dirty(journal->j_header_bh) ;
++ sync_dirty_buffer(journal->j_header_bh) ;
+ }
+- if (!buffer_uptodate(SB_JOURNAL(p_s_sb)->j_header_bh)) {
++ if (!buffer_uptodate(journal->j_header_bh)) {
+ reiserfs_warning (p_s_sb, "journal-837: IO error during journal replay");
+ return -EIO ;
+ }
+@@ -1153,13 +1168,14 @@
+ {
+ struct list_head *entry;
+ struct reiserfs_journal_list *other_jl ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ unsigned long trans_id = jl->j_trans_id;
+
+ /* we know we are the only ones flushing things, no extra race
+ * protection is required.
+ */
+ restart:
+- entry = SB_JOURNAL(p_s_sb)->j_journal_list.next;
++ entry = journal->j_journal_list.next;
+ other_jl = JOURNAL_LIST_ENTRY(entry);
+ if (other_jl->j_trans_id < trans_id) {
+ /* do not flush all */
+@@ -1173,9 +1189,10 @@
+
+ static void del_from_work_list(struct super_block *s,
+ struct reiserfs_journal_list *jl) {
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+ if (!list_empty(&jl->j_working_list)) {
+ list_del_init(&jl->j_working_list);
+- SB_JOURNAL(s)->j_num_work_lists--;
++ journal->j_num_work_lists--;
+ }
+ }
+
+@@ -1197,27 +1214,28 @@
+ int was_dirty = 0 ;
+ struct buffer_head *saved_bh ;
+ unsigned long j_len_saved = jl->j_len ;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+
+ if (j_len_saved <= 0) {
+ BUG();
+ }
+
+- if (atomic_read(&SB_JOURNAL(s)->j_wcount) != 0) {
++ if (atomic_read(&journal->j_wcount) != 0) {
+ reiserfs_warning(s, "clm-2048: flush_journal_list called with wcount %d",
+- atomic_read(&SB_JOURNAL(s)->j_wcount)) ;
++ atomic_read(&journal->j_wcount)) ;
+ }
+ if (jl->j_trans_id == 0)
+ BUG();
+
+ /* if flushall == 0, the lock is already held */
+ if (flushall) {
+- down(&SB_JOURNAL(s)->j_flush_sem);
+- } else if (!down_trylock(&SB_JOURNAL(s)->j_flush_sem)) {
++ down(&journal->j_flush_sem);
++ } else if (!down_trylock(&journal->j_flush_sem)) {
+ BUG();
+ }
+
+ count = 0 ;
+- if (j_len_saved > SB_JOURNAL_TRANS_MAX(s)) {
++ if (j_len_saved > journal->j_trans_max) {
+ reiserfs_panic(s, "journal-715: flush_journal_list, length is %lu, trans id %lu\n", j_len_saved, jl->j_trans_id);
+ return 0 ;
+ }
+@@ -1245,7 +1263,7 @@
+ /* loop through each cnode, see if we need to write it,
+ ** or wait on a more recent transaction, or just ignore it
+ */
+- if (atomic_read(&(SB_JOURNAL(s)->j_wcount)) != 0) {
++ if (atomic_read(&(journal->j_wcount)) != 0) {
+ reiserfs_panic(s, "journal-844: panic journal list is flushing, wcount is not 0\n") ;
+ }
+ cn = jl->j_realblock ;
+@@ -1385,16 +1403,16 @@
+ }
+ remove_all_from_journal_list(s, jl, 0) ;
+ list_del(&jl->j_list);
+- SB_JOURNAL(s)->j_num_lists--;
++ journal->j_num_lists--;
+ del_from_work_list(s, jl);
+
+- if (SB_JOURNAL(s)->j_last_flush_id != 0 &&
+- (jl->j_trans_id - SB_JOURNAL(s)->j_last_flush_id) != 1) {
++ if (journal->j_last_flush_id != 0 &&
++ (jl->j_trans_id - journal->j_last_flush_id) != 1) {
+ reiserfs_warning(s, "clm-2201: last flush %lu, current %lu",
+- SB_JOURNAL(s)->j_last_flush_id,
++ journal->j_last_flush_id,
+ jl->j_trans_id);
+ }
+- SB_JOURNAL(s)->j_last_flush_id = jl->j_trans_id;
++ journal->j_last_flush_id = jl->j_trans_id;
+
+ /* not strictly required since we are freeing the list, but it should
+ * help find code using dead lists later on
+@@ -1408,7 +1426,7 @@
+ jl->j_state = 0;
+ put_journal_list(s, jl);
+ if (flushall)
+- up(&SB_JOURNAL(s)->j_flush_sem);
++ up(&journal->j_flush_sem);
+ return 0 ;
+ }
+
+@@ -1510,9 +1528,10 @@
+ unsigned long orig_trans_id = jl->j_trans_id;
+ struct buffer_chunk chunk;
+ struct list_head *entry;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+ chunk.nr = 0;
+
+- down(&SB_JOURNAL(s)->j_flush_sem);
++ down(&journal->j_flush_sem);
+ if (!journal_list_still_alive(s, orig_trans_id)) {
+ goto done;
+ }
+@@ -1538,7 +1557,7 @@
+ entry = jl->j_list.next;
+
+ /* did we wrap? */
+- if (entry == &SB_JOURNAL(s)->j_journal_list) {
++ if (entry == &journal->j_journal_list) {
+ break;
+ }
+ jl = JOURNAL_LIST_ENTRY(entry);
+@@ -1552,7 +1571,7 @@
+ }
+
+ done:
+- up(&SB_JOURNAL(s)->j_flush_sem);
++ up(&journal->j_flush_sem);
+ return ret;
+ }
+
+@@ -1575,6 +1594,7 @@
+ struct reiserfs_journal_list *tjl;
+ struct reiserfs_journal_list *flush_jl;
+ unsigned long trans_id;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+
+ flush_jl = tjl = jl;
+
+@@ -1593,7 +1613,7 @@
+ }
+ len += cur_len;
+ flush_jl = tjl;
+- if (tjl->j_list.next == &SB_JOURNAL(s)->j_journal_list)
++ if (tjl->j_list.next == &journal->j_journal_list)
+ break;
+ tjl = JOURNAL_LIST_ENTRY(tjl->j_list.next);
+ }
+@@ -1649,21 +1669,22 @@
+ }
+
+ static void free_journal_ram(struct super_block *p_s_sb) {
+- reiserfs_kfree(SB_JOURNAL(p_s_sb)->j_current_jl,
++ struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ reiserfs_kfree(journal->j_current_jl,
+ sizeof(struct reiserfs_journal_list), p_s_sb);
+- SB_JOURNAL(p_s_sb)->j_num_lists--;
++ journal->j_num_lists--;
+
+- vfree(SB_JOURNAL(p_s_sb)->j_cnode_free_orig) ;
+- free_list_bitmaps(p_s_sb, SB_JOURNAL(p_s_sb)->j_list_bitmap) ;
++ vfree(journal->j_cnode_free_orig) ;
++ free_list_bitmaps(p_s_sb, journal->j_list_bitmap) ;
+ free_bitmap_nodes(p_s_sb) ; /* must be after free_list_bitmaps */
+- if (SB_JOURNAL(p_s_sb)->j_header_bh) {
+- brelse(SB_JOURNAL(p_s_sb)->j_header_bh) ;
++ if (journal->j_header_bh) {
++ brelse(journal->j_header_bh) ;
+ }
+ /* j_header_bh is on the journal dev, make sure not to release the journal
+ * dev until we brelse j_header_bh
+ */
+- release_journal_dev(p_s_sb, SB_JOURNAL(p_s_sb));
+- vfree(SB_JOURNAL(p_s_sb)) ;
++ release_journal_dev(p_s_sb, journal);
++ vfree(journal) ;
+ }
+
+ /*
+@@ -1718,7 +1739,7 @@
+ struct reiserfs_journal_commit *commit) {
+ if (get_commit_trans_id (commit) != get_desc_trans_id (desc) ||
+ get_commit_trans_len (commit) != get_desc_trans_len (desc) ||
+- get_commit_trans_len (commit) > SB_JOURNAL_TRANS_MAX(p_s_sb) ||
++ get_commit_trans_len (commit) > SB_JOURNAL(p_s_sb)->j_trans_max ||
+ get_commit_trans_len (commit) <= 0
+ ) {
+ return 1 ;
+@@ -1754,7 +1775,7 @@
+ *newest_mount_id) ;
+ return -1 ;
+ }
+- if ( get_desc_trans_len(desc) > SB_JOURNAL_TRANS_MAX(p_s_sb) ) {
++ if ( get_desc_trans_len(desc) > SB_JOURNAL(p_s_sb)->j_trans_max ) {
+ reiserfs_warning(p_s_sb, "journal-2018: Bad transaction length %d encountered, ignoring transaction", get_desc_trans_len(desc));
+ return -1 ;
+ }
+@@ -1807,6 +1828,7 @@
+ */
+ static int journal_read_transaction(struct super_block *p_s_sb, unsigned long cur_dblock, unsigned long oldest_start,
+ unsigned long oldest_trans_id, unsigned long newest_mount_id) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_desc *desc ;
+ struct reiserfs_journal_commit *commit ;
+ unsigned long trans_id = 0 ;
+@@ -1939,9 +1961,9 @@
+ cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb)) ;
+
+ /* init starting values for the first transaction, in case this is the last transaction to be replayed. */
+- SB_JOURNAL(p_s_sb)->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) ;
+- SB_JOURNAL(p_s_sb)->j_last_flush_trans_id = trans_id ;
+- SB_JOURNAL(p_s_sb)->j_trans_id = trans_id + 1;
++ journal->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) ;
++ journal->j_last_flush_trans_id = trans_id ;
++ journal->j_trans_id = trans_id + 1;
+ brelse(c_bh) ;
+ brelse(d_bh) ;
+ reiserfs_kfree(log_blocks, le32_to_cpu(desc->j_len) * sizeof(struct buffer_head *), p_s_sb) ;
+@@ -2001,6 +2023,7 @@
+ ** On exit, it sets things up so the first transaction will work correctly.
+ */
+ static int journal_read(struct super_block *p_s_sb) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_desc *desc ;
+ unsigned long oldest_trans_id = 0;
+ unsigned long oldest_invalid_trans_id = 0 ;
+@@ -2018,20 +2041,20 @@
+
+ cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) ;
+ reiserfs_info (p_s_sb, "checking transaction log (%s)\n",
+- bdevname(SB_JOURNAL(p_s_sb)->j_dev_bd, b));
++ bdevname(journal->j_dev_bd, b));
+ start = get_seconds();
+
+ /* step 1, read in the journal header block. Check the transaction it says
+ ** is the first unflushed, and if that transaction is not valid,
+ ** replay is done
+ */
+- SB_JOURNAL(p_s_sb)->j_header_bh = journal_bread(p_s_sb,
++ journal->j_header_bh = journal_bread(p_s_sb,
+ SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
+ SB_ONDISK_JOURNAL_SIZE(p_s_sb));
+- if (!SB_JOURNAL(p_s_sb)->j_header_bh) {
++ if (!journal->j_header_bh) {
+ return 1 ;
+ }
+- jh = (struct reiserfs_journal_header *)(SB_JOURNAL(p_s_sb)->j_header_bh->b_data) ;
++ jh = (struct reiserfs_journal_header *)(journal->j_header_bh->b_data) ;
+ if (le32_to_cpu(jh->j_first_unflushed_offset) >= 0 &&
+ le32_to_cpu(jh->j_first_unflushed_offset) < SB_ONDISK_JOURNAL_SIZE(p_s_sb) &&
+ le32_to_cpu(jh->j_last_flush_trans_id) > 0) {
+@@ -2070,7 +2093,7 @@
+ while(continue_replay && cur_dblock < (SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + SB_ONDISK_JOURNAL_SIZE(p_s_sb))) {
+ /* Note that it is required for blocksize of primary fs device and journal
+ device to be the same */
+- d_bh = reiserfs_breada(SB_JOURNAL(p_s_sb)->j_dev_bd, cur_dblock, p_s_sb->s_blocksize,
++ d_bh = reiserfs_breada(journal->j_dev_bd, cur_dblock, p_s_sb->s_blocksize,
+ SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + SB_ONDISK_JOURNAL_SIZE(p_s_sb)) ;
+ ret = journal_transaction_is_valid(p_s_sb, d_bh, &oldest_invalid_trans_id, &newest_mount_id) ;
+ if (ret == 1) {
+@@ -2121,7 +2144,7 @@
+ } else if (ret != 0) {
+ break ;
+ }
+- cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + SB_JOURNAL(p_s_sb)->j_start ;
++ cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + journal->j_start ;
+ replay_count++ ;
+ if (cur_dblock == oldest_start)
+ break;
+@@ -2136,23 +2159,23 @@
+ ** copy the trans_id from the header
+ */
+ if (valid_journal_header && replay_count == 0) {
+- SB_JOURNAL(p_s_sb)->j_start = le32_to_cpu(jh->j_first_unflushed_offset) ;
+- SB_JOURNAL(p_s_sb)->j_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) + 1;
+- SB_JOURNAL(p_s_sb)->j_last_flush_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) ;
+- SB_JOURNAL(p_s_sb)->j_mount_id = le32_to_cpu(jh->j_mount_id) + 1;
++ journal->j_start = le32_to_cpu(jh->j_first_unflushed_offset) ;
++ journal->j_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) + 1;
++ journal->j_last_flush_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) ;
++ journal->j_mount_id = le32_to_cpu(jh->j_mount_id) + 1;
+ } else {
+- SB_JOURNAL(p_s_sb)->j_mount_id = newest_mount_id + 1 ;
++ journal->j_mount_id = newest_mount_id + 1 ;
+ }
+ reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1299: Setting "
+- "newest_mount_id to %lu", SB_JOURNAL(p_s_sb)->j_mount_id) ;
+- SB_JOURNAL(p_s_sb)->j_first_unflushed_offset = SB_JOURNAL(p_s_sb)->j_start ;
++ "newest_mount_id to %lu", journal->j_mount_id) ;
++ journal->j_first_unflushed_offset = journal->j_start ;
+ if (replay_count > 0) {
+ reiserfs_info (p_s_sb, "replayed %d transactions in %lu seconds\n",
+ replay_count, get_seconds() - start) ;
+ }
+ if (!bdev_read_only(p_s_sb->s_bdev) &&
+- _update_journal_header_block(p_s_sb, SB_JOURNAL(p_s_sb)->j_start,
+- SB_JOURNAL(p_s_sb)->j_last_flush_trans_id))
++ _update_journal_header_block(p_s_sb, journal->j_start,
++ journal->j_last_flush_trans_id))
+ {
+ /* replay failed, caller must call free_journal_ram and abort
+ ** the mount
+@@ -2287,12 +2310,12 @@
+ return 1 ;
+ }
+ memset(journal, 0, sizeof(struct reiserfs_journal)) ;
+- INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_bitmap_nodes) ;
+- INIT_LIST_HEAD (&SB_JOURNAL(p_s_sb)->j_prealloc_list);
+- INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_working_list);
+- INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_journal_list);
++ INIT_LIST_HEAD(&journal->j_bitmap_nodes) ;
++ INIT_LIST_HEAD (&journal->j_prealloc_list);
++ INIT_LIST_HEAD(&journal->j_working_list);
++ INIT_LIST_HEAD(&journal->j_journal_list);
+ if (reiserfs_allocate_list_bitmaps(p_s_sb,
+- SB_JOURNAL(p_s_sb)->j_list_bitmap,
++ journal->j_list_bitmap,
+ SB_BMAP_NR(p_s_sb)))
+ goto free_and_return ;
+ allocate_bitmap_nodes(p_s_sb) ;
+@@ -2337,108 +2360,108 @@
+ "(device %s) does not match to magic found in super "
+ "block %x",
+ jh->jh_journal.jp_journal_magic,
+- bdevname( SB_JOURNAL(p_s_sb)->j_dev_bd, b),
++ bdevname( journal->j_dev_bd, b),
+ sb_jp_journal_magic(rs));
+ brelse (bhjh);
+ goto free_and_return;
+ }
+
+- SB_JOURNAL_TRANS_MAX(p_s_sb) = le32_to_cpu (jh->jh_journal.jp_journal_trans_max);
+- SB_JOURNAL_MAX_BATCH(p_s_sb) = le32_to_cpu (jh->jh_journal.jp_journal_max_batch);
+- SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = le32_to_cpu (jh->jh_journal.jp_journal_max_commit_age);
+- SB_JOURNAL_MAX_TRANS_AGE(p_s_sb) = JOURNAL_MAX_TRANS_AGE;
++ journal->j_trans_max = le32_to_cpu (jh->jh_journal.jp_journal_trans_max);
++ journal->j_max_batch = le32_to_cpu (jh->jh_journal.jp_journal_max_batch);
++ journal->j_max_commit_age = le32_to_cpu (jh->jh_journal.jp_journal_max_commit_age);
++ journal->j_max_trans_age = JOURNAL_MAX_TRANS_AGE;
+
+- if (SB_JOURNAL_TRANS_MAX(p_s_sb)) {
++ if (journal->j_trans_max) {
+ /* make sure these parameters are available, assign it if they are not */
+- __u32 initial = SB_JOURNAL_TRANS_MAX(p_s_sb);
++ __u32 initial = journal->j_trans_max;
+ __u32 ratio = 1;
+
+ if (p_s_sb->s_blocksize < 4096)
+ ratio = 4096 / p_s_sb->s_blocksize;
+
+- if (SB_ONDISK_JOURNAL_SIZE(p_s_sb)/SB_JOURNAL_TRANS_MAX(p_s_sb) < JOURNAL_MIN_RATIO)
+- SB_JOURNAL_TRANS_MAX(p_s_sb) = SB_ONDISK_JOURNAL_SIZE(p_s_sb) / JOURNAL_MIN_RATIO;
+- if (SB_JOURNAL_TRANS_MAX(p_s_sb) > JOURNAL_TRANS_MAX_DEFAULT / ratio)
+- SB_JOURNAL_TRANS_MAX(p_s_sb) = JOURNAL_TRANS_MAX_DEFAULT / ratio;
+- if (SB_JOURNAL_TRANS_MAX(p_s_sb) < JOURNAL_TRANS_MIN_DEFAULT / ratio)
+- SB_JOURNAL_TRANS_MAX(p_s_sb) = JOURNAL_TRANS_MIN_DEFAULT / ratio;
++ if (SB_ONDISK_JOURNAL_SIZE(p_s_sb)/journal->j_trans_max < JOURNAL_MIN_RATIO)
++ journal->j_trans_max = SB_ONDISK_JOURNAL_SIZE(p_s_sb) / JOURNAL_MIN_RATIO;
++ if (journal->j_trans_max > JOURNAL_TRANS_MAX_DEFAULT / ratio)
++ journal->j_trans_max = JOURNAL_TRANS_MAX_DEFAULT / ratio;
++ if (journal->j_trans_max < JOURNAL_TRANS_MIN_DEFAULT / ratio)
++ journal->j_trans_max = JOURNAL_TRANS_MIN_DEFAULT / ratio;
+
+- if (SB_JOURNAL_TRANS_MAX(p_s_sb) != initial)
++ if (journal->j_trans_max != initial)
+ reiserfs_warning (p_s_sb, "sh-461: journal_init: wrong transaction max size (%u). Changed to %u",
+- initial, SB_JOURNAL_TRANS_MAX(p_s_sb));
++ initial, journal->j_trans_max);
+
+- SB_JOURNAL_MAX_BATCH(p_s_sb) = SB_JOURNAL_TRANS_MAX(p_s_sb)*
++ journal->j_max_batch = journal->j_trans_max*
+ JOURNAL_MAX_BATCH_DEFAULT/JOURNAL_TRANS_MAX_DEFAULT;
+ }
+
+- if (!SB_JOURNAL_TRANS_MAX(p_s_sb)) {
++ if (!journal->j_trans_max) {
+ /*we have the file system was created by old version of mkreiserfs
+ so this field contains zero value */
+- SB_JOURNAL_TRANS_MAX(p_s_sb) = JOURNAL_TRANS_MAX_DEFAULT ;
+- SB_JOURNAL_MAX_BATCH(p_s_sb) = JOURNAL_MAX_BATCH_DEFAULT ;
+- SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = JOURNAL_MAX_COMMIT_AGE ;
++ journal->j_trans_max = JOURNAL_TRANS_MAX_DEFAULT ;
++ journal->j_max_batch = JOURNAL_MAX_BATCH_DEFAULT ;
++ journal->j_max_commit_age = JOURNAL_MAX_COMMIT_AGE ;
+
+ /* for blocksize >= 4096 - max transaction size is 1024. For block size < 4096
+ trans max size is decreased proportionally */
+ if (p_s_sb->s_blocksize < 4096) {
+- SB_JOURNAL_TRANS_MAX(p_s_sb) /= (4096 / p_s_sb->s_blocksize) ;
+- SB_JOURNAL_MAX_BATCH(p_s_sb) = (SB_JOURNAL_TRANS_MAX(p_s_sb)) * 9 / 10 ;
++ journal->j_trans_max /= (4096 / p_s_sb->s_blocksize) ;
++ journal->j_max_batch = (journal->j_trans_max) * 9 / 10 ;
+ }
+ }
+
+- SB_JOURNAL_DEFAULT_MAX_COMMIT_AGE(p_s_sb) = SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb);
++ journal->j_default_max_commit_age = journal->j_max_commit_age;
+
+ if (commit_max_age != 0) {
+- SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = commit_max_age;
+- SB_JOURNAL_MAX_TRANS_AGE(p_s_sb) = commit_max_age;
++ journal->j_max_commit_age = commit_max_age;
++ journal->j_max_trans_age = commit_max_age;
+ }
+
+ reiserfs_info (p_s_sb, "journal params: device %s, size %u, "
+ "journal first block %u, max trans len %u, max batch %u, "
+ "max commit age %u, max trans age %u\n",
+- bdevname( SB_JOURNAL(p_s_sb)->j_dev_bd, b),
++ bdevname( journal->j_dev_bd, b),
+ SB_ONDISK_JOURNAL_SIZE(p_s_sb),
+ SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
+- SB_JOURNAL_TRANS_MAX(p_s_sb),
+- SB_JOURNAL_MAX_BATCH(p_s_sb),
+- SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb),
+- SB_JOURNAL_MAX_TRANS_AGE(p_s_sb));
++ journal->j_trans_max,
++ journal->j_max_batch,
++ journal->j_max_commit_age,
++ journal->j_max_trans_age);
+
+ brelse (bhjh);
+
+- SB_JOURNAL(p_s_sb)->j_list_bitmap_index = 0 ;
++ journal->j_list_bitmap_index = 0 ;
+ journal_list_init(p_s_sb) ;
+
+- memset(SB_JOURNAL(p_s_sb)->j_list_hash_table, 0, JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *)) ;
++ memset(journal->j_list_hash_table, 0, JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *)) ;
+
+- INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_dirty_buffers) ;
+- spin_lock_init(&SB_JOURNAL(p_s_sb)->j_dirty_buffers_lock) ;
++ INIT_LIST_HEAD(&journal->j_dirty_buffers) ;
++ spin_lock_init(&journal->j_dirty_buffers_lock) ;
+
+- SB_JOURNAL(p_s_sb)->j_start = 0 ;
+- SB_JOURNAL(p_s_sb)->j_len = 0 ;
+- SB_JOURNAL(p_s_sb)->j_len_alloc = 0 ;
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_wcount), 0) ;
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_async_throttle), 0) ;
+- SB_JOURNAL(p_s_sb)->j_bcount = 0 ;
+- SB_JOURNAL(p_s_sb)->j_trans_start_time = 0 ;
+- SB_JOURNAL(p_s_sb)->j_last = NULL ;
+- SB_JOURNAL(p_s_sb)->j_first = NULL ;
+- init_waitqueue_head(&(SB_JOURNAL(p_s_sb)->j_join_wait)) ;
+- sema_init(&SB_JOURNAL(p_s_sb)->j_lock, 1);
+- sema_init(&SB_JOURNAL(p_s_sb)->j_flush_sem, 1);
+-
+- SB_JOURNAL(p_s_sb)->j_trans_id = 10 ;
+- SB_JOURNAL(p_s_sb)->j_mount_id = 10 ;
+- SB_JOURNAL(p_s_sb)->j_state = 0 ;
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_jlock), 0) ;
+- SB_JOURNAL(p_s_sb)->j_cnode_free_list = allocate_cnodes(num_cnodes) ;
+- SB_JOURNAL(p_s_sb)->j_cnode_free_orig = SB_JOURNAL(p_s_sb)->j_cnode_free_list ;
+- SB_JOURNAL(p_s_sb)->j_cnode_free = SB_JOURNAL(p_s_sb)->j_cnode_free_list ? num_cnodes : 0 ;
+- SB_JOURNAL(p_s_sb)->j_cnode_used = 0 ;
+- SB_JOURNAL(p_s_sb)->j_must_wait = 0 ;
++ journal->j_start = 0 ;
++ journal->j_len = 0 ;
++ journal->j_len_alloc = 0 ;
++ atomic_set(&(journal->j_wcount), 0) ;
++ atomic_set(&(journal->j_async_throttle), 0) ;
++ journal->j_bcount = 0 ;
++ journal->j_trans_start_time = 0 ;
++ journal->j_last = NULL ;
++ journal->j_first = NULL ;
++ init_waitqueue_head(&(journal->j_join_wait)) ;
++ sema_init(&journal->j_lock, 1);
++ sema_init(&journal->j_flush_sem, 1);
++
++ journal->j_trans_id = 10 ;
++ journal->j_mount_id = 10 ;
++ journal->j_state = 0 ;
++ atomic_set(&(journal->j_jlock), 0) ;
++ journal->j_cnode_free_list = allocate_cnodes(num_cnodes) ;
++ journal->j_cnode_free_orig = journal->j_cnode_free_list ;
++ journal->j_cnode_free = journal->j_cnode_free_list ? num_cnodes : 0 ;
++ journal->j_cnode_used = 0 ;
++ journal->j_must_wait = 0 ;
+
+ init_journal_hash(p_s_sb) ;
+- jl = SB_JOURNAL(p_s_sb)->j_current_jl;
++ jl = journal->j_current_jl;
+ jl->j_list_bitmap = get_list_bitmap(p_s_sb, jl);
+ if (!jl->j_list_bitmap) {
+ reiserfs_warning(p_s_sb, "journal-2005, get_list_bitmap failed for journal list 0") ;
+@@ -2466,15 +2489,16 @@
+ ** transaction
+ */
+ int journal_transaction_should_end(struct reiserfs_transaction_handle *th, int new_alloc) {
++ struct reiserfs_journal *journal = SB_JOURNAL (th->t_super);
+ time_t now = get_seconds() ;
+ /* cannot restart while nested */
+ if (th->t_refcount > 1)
+ return 0 ;
+- if ( SB_JOURNAL(th->t_super)->j_must_wait > 0 ||
+- (SB_JOURNAL(th->t_super)->j_len_alloc + new_alloc) >= SB_JOURNAL_MAX_BATCH(th->t_super) ||
+- atomic_read(&(SB_JOURNAL(th->t_super)->j_jlock)) ||
+- (now - SB_JOURNAL(th->t_super)->j_trans_start_time) > SB_JOURNAL_MAX_TRANS_AGE(th->t_super) ||
+- SB_JOURNAL(th->t_super)->j_cnode_free < (SB_JOURNAL_TRANS_MAX(th->t_super) * 3)) {
++ if ( journal->j_must_wait > 0 ||
++ (journal->j_len_alloc + new_alloc) >= journal->j_max_batch ||
++ atomic_read(&(journal->j_jlock)) ||
++ (now - journal->j_trans_start_time) > journal->j_max_trans_age ||
++ journal->j_cnode_free < (journal->j_trans_max * 3)) {
+ return 1 ;
+ }
+ return 0 ;
+@@ -2484,9 +2508,9 @@
+ ** kernel_lock to be held
+ */
+ void reiserfs_block_writes(struct reiserfs_transaction_handle *th) {
+- struct super_block *s = th->t_super ;
+- SB_JOURNAL(s)->j_must_wait = 1 ;
+- set_bit(WRITERS_BLOCKED, &SB_JOURNAL(s)->j_state) ;
++ struct reiserfs_journal *journal = SB_JOURNAL (th->t_super);
++ journal->j_must_wait = 1 ;
++ set_bit(WRITERS_BLOCKED, &journal->j_state) ;
+ return ;
+ }
+
+@@ -2494,58 +2518,63 @@
+ ** require BKL
+ */
+ void reiserfs_allow_writes(struct super_block *s) {
+- clear_bit(WRITERS_BLOCKED, &SB_JOURNAL(s)->j_state) ;
+- wake_up(&SB_JOURNAL(s)->j_join_wait) ;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
++ clear_bit(WRITERS_BLOCKED, &journal->j_state) ;
++ wake_up(&journal->j_join_wait) ;
+ }
+
+ /* this must be called without a transaction started, and does not
+ ** require BKL
+ */
+ void reiserfs_wait_on_write_block(struct super_block *s) {
+- wait_event(SB_JOURNAL(s)->j_join_wait,
+- !test_bit(WRITERS_BLOCKED, &SB_JOURNAL(s)->j_state)) ;
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
++ wait_event(journal->j_join_wait,
++ !test_bit(WRITERS_BLOCKED, &journal->j_state)) ;
+ }
+
+ static void queue_log_writer(struct super_block *s) {
+ wait_queue_t wait;
+- set_bit(WRITERS_QUEUED, &SB_JOURNAL(s)->j_state);
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
++ set_bit(WRITERS_QUEUED, &journal->j_state);
+
+ /*
+ * we don't want to use wait_event here because
+ * we only want to wait once.
+ */
+ init_waitqueue_entry(&wait, current);
+- add_wait_queue(&SB_JOURNAL(s)->j_join_wait, &wait);
++ add_wait_queue(&journal->j_join_wait, &wait);
+ set_current_state(TASK_UNINTERRUPTIBLE);
+- if (test_bit(WRITERS_QUEUED, &SB_JOURNAL(s)->j_state))
++ if (test_bit(WRITERS_QUEUED, &journal->j_state))
+ schedule();
+ current->state = TASK_RUNNING;
+- remove_wait_queue(&SB_JOURNAL(s)->j_join_wait, &wait);
++ remove_wait_queue(&journal->j_join_wait, &wait);
+ }
+
+ static void wake_queued_writers(struct super_block *s) {
+- if (test_and_clear_bit(WRITERS_QUEUED, &SB_JOURNAL(s)->j_state))
+- wake_up(&SB_JOURNAL(s)->j_join_wait);
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
++ if (test_and_clear_bit(WRITERS_QUEUED, &journal->j_state))
++ wake_up(&journal->j_join_wait);
+ }
+
+ static void let_transaction_grow(struct super_block *sb,
+ unsigned long trans_id)
+ {
+- unsigned long bcount = SB_JOURNAL(sb)->j_bcount;
++ struct reiserfs_journal *journal = SB_JOURNAL (sb);
++ unsigned long bcount = journal->j_bcount;
+ while(1) {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(1);
+- SB_JOURNAL(sb)->j_current_jl->j_state |= LIST_COMMIT_PENDING;
+- while ((atomic_read(&SB_JOURNAL(sb)->j_wcount) > 0 ||
+- atomic_read(&SB_JOURNAL(sb)->j_jlock)) &&
+- SB_JOURNAL(sb)->j_trans_id == trans_id) {
++ journal->j_current_jl->j_state |= LIST_COMMIT_PENDING;
++ while ((atomic_read(&journal->j_wcount) > 0 ||
++ atomic_read(&journal->j_jlock)) &&
++ journal->j_trans_id == trans_id) {
+ queue_log_writer(sb);
+ }
+- if (SB_JOURNAL(sb)->j_trans_id != trans_id)
++ if (journal->j_trans_id != trans_id)
+ break;
+- if (bcount == SB_JOURNAL(sb)->j_bcount)
++ if (bcount == journal->j_bcount)
+ break;
+- bcount = SB_JOURNAL(sb)->j_bcount;
++ bcount = journal->j_bcount;
+ }
+ }
+
+@@ -2589,17 +2618,17 @@
+ */
+
+ if ( (!join && journal->j_must_wait > 0) ||
+- ( !join && (journal->j_len_alloc + nblocks + 2) >= SB_JOURNAL_MAX_BATCH(p_s_sb)) ||
++ ( !join && (journal->j_len_alloc + nblocks + 2) >= journal->j_max_batch) ||
+ (!join && atomic_read(&journal->j_wcount) > 0 && journal->j_trans_start_time > 0 &&
+- (now - journal->j_trans_start_time) > SB_JOURNAL_MAX_TRANS_AGE(p_s_sb)) ||
++ (now - journal->j_trans_start_time) > journal->j_max_trans_age) ||
+ (!join && atomic_read(&journal->j_jlock)) ||
+- (!join && journal->j_cnode_free < (SB_JOURNAL_TRANS_MAX(p_s_sb) * 3))) {
++ (!join && journal->j_cnode_free < (journal->j_trans_max * 3))) {
+
+ old_trans_id = journal->j_trans_id;
+ unlock_journal(p_s_sb) ; /* allow others to finish this transaction */
+
+ if (!join && (journal->j_len_alloc + nblocks + 2) >=
+- SB_JOURNAL_MAX_BATCH(p_s_sb) &&
++ journal->j_max_batch &&
+ ((journal->j_len + nblocks + 2) * 100) < (journal->j_len_alloc * 75))
+ {
+ if (atomic_read(&journal->j_wcount) > 10) {
+@@ -2621,7 +2650,7 @@
+ journal_join(&myth, p_s_sb, 1) ;
+
+ /* someone might have ended the transaction while we joined */
+- if (old_trans_id != SB_JOURNAL(p_s_sb)->j_trans_id) {
++ if (old_trans_id != journal->j_trans_id) {
+ do_journal_end(&myth, p_s_sb, 1, 0) ;
+ } else {
+ do_journal_end(&myth, p_s_sb, 1, COMMIT_NOW) ;
+@@ -2734,14 +2763,15 @@
+ ** if j_len, is bigger than j_len_alloc, it pushes j_len_alloc to 10 + j_len.
+ */
+ int journal_mark_dirty(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, struct buffer_head *bh) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn = NULL;
+ int count_already_incd = 0 ;
+ int prepared = 0 ;
+
+ PROC_INFO_INC( p_s_sb, journal.mark_dirty );
+- if (th->t_trans_id != SB_JOURNAL(p_s_sb)->j_trans_id) {
++ if (th->t_trans_id != journal->j_trans_id) {
+ reiserfs_panic(th->t_super, "journal-1577: handle trans id %ld != current trans id %ld\n",
+- th->t_trans_id, SB_JOURNAL(p_s_sb)->j_trans_id);
++ th->t_trans_id, journal->j_trans_id);
+ }
+ p_s_sb->s_dirt = 1;
+
+@@ -2766,15 +2796,15 @@
+ buffer_journal_dirty(bh) ? ' ' : '!') ;
+ }
+
+- if (atomic_read(&(SB_JOURNAL(p_s_sb)->j_wcount)) <= 0) {
+- reiserfs_warning (p_s_sb, "journal-1409: journal_mark_dirty returning because j_wcount was %d", atomic_read(&(SB_JOURNAL(p_s_sb)->j_wcount))) ;
++ if (atomic_read(&(journal->j_wcount)) <= 0) {
++ reiserfs_warning (p_s_sb, "journal-1409: journal_mark_dirty returning because j_wcount was %d", atomic_read(&(journal->j_wcount))) ;
+ return 1 ;
+ }
+ /* this error means I've screwed up, and we've overflowed the transaction.
+ ** Nothing can be done here, except make the FS readonly or panic.
+ */
+- if (SB_JOURNAL(p_s_sb)->j_len >= SB_JOURNAL_TRANS_MAX(p_s_sb)) {
+- reiserfs_panic(th->t_super, "journal-1413: journal_mark_dirty: j_len (%lu) is too big\n", SB_JOURNAL(p_s_sb)->j_len) ;
++ if (journal->j_len >= journal->j_trans_max) {
++ reiserfs_panic(th->t_super, "journal-1413: journal_mark_dirty: j_len (%lu) is too big\n", journal->j_len) ;
+ }
+
+ if (buffer_journal_dirty(bh)) {
+@@ -2783,8 +2813,8 @@
+ clear_buffer_journal_dirty (bh);
+ }
+
+- if (SB_JOURNAL(p_s_sb)->j_len > SB_JOURNAL(p_s_sb)->j_len_alloc) {
+- SB_JOURNAL(p_s_sb)->j_len_alloc = SB_JOURNAL(p_s_sb)->j_len + JOURNAL_PER_BALANCE_CNT ;
++ if (journal->j_len > journal->j_len_alloc) {
++ journal->j_len_alloc = journal->j_len + JOURNAL_PER_BALANCE_CNT ;
+ }
+
+ set_buffer_journaled (bh);
+@@ -2798,29 +2828,29 @@
+
+ if (th->t_blocks_logged == th->t_blocks_allocated) {
+ th->t_blocks_allocated += JOURNAL_PER_BALANCE_CNT ;
+- SB_JOURNAL(p_s_sb)->j_len_alloc += JOURNAL_PER_BALANCE_CNT ;
++ journal->j_len_alloc += JOURNAL_PER_BALANCE_CNT ;
+ }
+ th->t_blocks_logged++ ;
+- SB_JOURNAL(p_s_sb)->j_len++ ;
++ journal->j_len++ ;
+
+ cn->bh = bh ;
+ cn->blocknr = bh->b_blocknr ;
+ cn->sb = p_s_sb;
+ cn->jlist = NULL ;
+- insert_journal_hash(SB_JOURNAL(p_s_sb)->j_hash_table, cn) ;
++ insert_journal_hash(journal->j_hash_table, cn) ;
+ if (!count_already_incd) {
+ get_bh(bh) ;
+ }
+ }
+ cn->next = NULL ;
+- cn->prev = SB_JOURNAL(p_s_sb)->j_last ;
++ cn->prev = journal->j_last ;
+ cn->bh = bh ;
+- if (SB_JOURNAL(p_s_sb)->j_last) {
+- SB_JOURNAL(p_s_sb)->j_last->next = cn ;
+- SB_JOURNAL(p_s_sb)->j_last = cn ;
++ if (journal->j_last) {
++ journal->j_last->next = cn ;
++ journal->j_last = cn ;
+ } else {
+- SB_JOURNAL(p_s_sb)->j_first = cn ;
+- SB_JOURNAL(p_s_sb)->j_last = cn ;
++ journal->j_first = cn ;
++ journal->j_last = cn ;
+ }
+ return 0 ;
+ }
+@@ -2860,9 +2890,10 @@
+ static int remove_from_transaction(struct super_block *p_s_sb, b_blocknr_t blocknr, int already_cleaned) {
+ struct buffer_head *bh ;
+ struct reiserfs_journal_cnode *cn ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ int ret = 0;
+
+- cn = get_journal_hash_dev(p_s_sb, SB_JOURNAL(p_s_sb)->j_hash_table, blocknr) ;
++ cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, blocknr) ;
+ if (!cn || !cn->bh) {
+ return ret ;
+ }
+@@ -2873,14 +2904,14 @@
+ if (cn->next) {
+ cn->next->prev = cn->prev ;
+ }
+- if (cn == SB_JOURNAL(p_s_sb)->j_first) {
+- SB_JOURNAL(p_s_sb)->j_first = cn->next ;
++ if (cn == journal->j_first) {
++ journal->j_first = cn->next ;
+ }
+- if (cn == SB_JOURNAL(p_s_sb)->j_last) {
+- SB_JOURNAL(p_s_sb)->j_last = cn->prev ;
++ if (cn == journal->j_last) {
++ journal->j_last = cn->prev ;
+ }
+ if (bh)
+- remove_journal_hash(p_s_sb, SB_JOURNAL(p_s_sb)->j_hash_table, NULL, bh->b_blocknr, 0) ;
++ remove_journal_hash(p_s_sb, journal->j_hash_table, NULL, bh->b_blocknr, 0) ;
+ clear_buffer_journaled (bh); /* don't log this one */
+
+ if (!already_cleaned) {
+@@ -2891,8 +2922,8 @@
+ }
+ ret = 1 ;
+ }
+- SB_JOURNAL(p_s_sb)->j_len-- ;
+- SB_JOURNAL(p_s_sb)->j_len_alloc-- ;
++ journal->j_len-- ;
++ journal->j_len_alloc-- ;
+ free_cnode(p_s_sb, cn) ;
+ return ret ;
+ }
+@@ -2943,12 +2974,13 @@
+ ** will wait until the current transaction is done/commited before returning
+ */
+ int journal_end_sync(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, unsigned long nblocks) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+
+ /* you can sync while nested, very, very bad */
+ if (th->t_refcount > 1) {
+ BUG() ;
+ }
+- if (SB_JOURNAL(p_s_sb)->j_len == 0) {
++ if (journal->j_len == 0) {
+ reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1) ;
+ journal_mark_dirty(th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb)) ;
+ }
+@@ -2960,13 +2992,14 @@
+ */
+ static void flush_async_commits(void *p) {
+ struct super_block *p_s_sb = p;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_list *jl;
+ struct list_head *entry;
+
+ lock_kernel();
+- if (!list_empty(&SB_JOURNAL(p_s_sb)->j_journal_list)) {
++ if (!list_empty(&journal->j_journal_list)) {
+ /* last entry is the youngest, commit it and you get everything */
+- entry = SB_JOURNAL(p_s_sb)->j_journal_list.prev;
++ entry = journal->j_journal_list.prev;
+ jl = JOURNAL_LIST_ENTRY(entry);
+ flush_commit_list(p_s_sb, jl, 1);
+ }
+@@ -2975,10 +3008,10 @@
+ * this is a little racey, but there's no harm in missing
+ * the filemap_fdata_write
+ */
+- if (!atomic_read(&SB_JOURNAL(p_s_sb)->j_async_throttle)) {
+- atomic_inc(&SB_JOURNAL(p_s_sb)->j_async_throttle);
++ if (!atomic_read(&journal->j_async_throttle)) {
++ atomic_inc(&journal->j_async_throttle);
+ filemap_fdatawrite(p_s_sb->s_bdev->bd_inode->i_mapping);
+- atomic_dec(&SB_JOURNAL(p_s_sb)->j_async_throttle);
++ atomic_dec(&journal->j_async_throttle);
+ }
+ }
+
+@@ -2989,23 +3022,23 @@
+ int reiserfs_flush_old_commits(struct super_block *p_s_sb) {
+ time_t now ;
+ struct reiserfs_transaction_handle th ;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+
+ now = get_seconds();
+ /* safety check so we don't flush while we are replaying the log during
+ * mount
+ */
+- if (list_empty(&SB_JOURNAL(p_s_sb)->j_journal_list)) {
++ if (list_empty(&journal->j_journal_list)) {
+ return 0 ;
+ }
+
+ /* check the current transaction. If there are no writers, and it is
+ * too old, finish it, and force the commit blocks to disk
+ */
+- if (atomic_read(&(SB_JOURNAL(p_s_sb)->j_wcount)) <= 0 &&
+- SB_JOURNAL(p_s_sb)->j_trans_start_time > 0 &&
+- SB_JOURNAL(p_s_sb)->j_len > 0 &&
+- (now - SB_JOURNAL(p_s_sb)->j_trans_start_time) >
+- SB_JOURNAL_MAX_TRANS_AGE(p_s_sb))
++ if (atomic_read(&journal->j_wcount) <= 0 &&
++ journal->j_trans_start_time > 0 &&
++ journal->j_len > 0 &&
++ (now - journal->j_trans_start_time) > journal->j_max_trans_age)
+ {
+ journal_join(&th, p_s_sb, 1) ;
+ reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1) ;
+@@ -3038,22 +3071,23 @@
+ int commit_now = flags & COMMIT_NOW ;
+ int wait_on_commit = flags & WAIT ;
+ struct reiserfs_journal_list *jl;
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+
+- if (th->t_trans_id != SB_JOURNAL(p_s_sb)->j_trans_id) {
++ if (th->t_trans_id != journal->j_trans_id) {
+ reiserfs_panic(th->t_super, "journal-1577: handle trans id %ld != current trans id %ld\n",
+- th->t_trans_id, SB_JOURNAL(p_s_sb)->j_trans_id);
++ th->t_trans_id, journal->j_trans_id);
+ }
+
+- SB_JOURNAL(p_s_sb)->j_len_alloc -= (th->t_blocks_allocated - th->t_blocks_logged) ;
+- if (atomic_read(&(SB_JOURNAL(p_s_sb)->j_wcount)) > 0) { /* <= 0 is allowed. unmounting might not call begin */
+- atomic_dec(&(SB_JOURNAL(p_s_sb)->j_wcount)) ;
++ journal->j_len_alloc -= (th->t_blocks_allocated - th->t_blocks_logged) ;
++ if (atomic_read(&(journal->j_wcount)) > 0) { /* <= 0 is allowed. unmounting might not call begin */
++ atomic_dec(&(journal->j_wcount)) ;
+ }
+
+ /* BUG, deal with case where j_len is 0, but people previously freed blocks need to be released
+ ** will be dealt with by next transaction that actually writes something, but should be taken
+ ** care of in this trans
+ */
+- if (SB_JOURNAL(p_s_sb)->j_len == 0) {
++ if (journal->j_len == 0) {
+ BUG();
+ }
+ /* if wcount > 0, and we are called to with flush or commit_now,
+@@ -3062,33 +3096,33 @@
+ ** Then, we flush the commit or journal list, and just return 0
+ ** because the rest of journal end was already done for this transaction.
+ */
+- if (atomic_read(&(SB_JOURNAL(p_s_sb)->j_wcount)) > 0) {
++ if (atomic_read(&(journal->j_wcount)) > 0) {
+ if (flush || commit_now) {
+ unsigned trans_id ;
+
+- jl = SB_JOURNAL(p_s_sb)->j_current_jl;
++ jl = journal->j_current_jl;
+ trans_id = jl->j_trans_id;
+ if (wait_on_commit)
+ jl->j_state |= LIST_COMMIT_PENDING;
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_jlock), 1) ;
++ atomic_set(&(journal->j_jlock), 1) ;
+ if (flush) {
+- SB_JOURNAL(p_s_sb)->j_next_full_flush = 1 ;
++ journal->j_next_full_flush = 1 ;
+ }
+ unlock_journal(p_s_sb) ;
+
+ /* sleep while the current transaction is still j_jlocked */
+- while(SB_JOURNAL(p_s_sb)->j_trans_id == trans_id) {
+- if (atomic_read(&SB_JOURNAL(p_s_sb)->j_jlock)) {
++ while(journal->j_trans_id == trans_id) {
++ if (atomic_read(&journal->j_jlock)) {
+ queue_log_writer(p_s_sb);
+ } else {
+ lock_journal(p_s_sb);
+- if (SB_JOURNAL(p_s_sb)->j_trans_id == trans_id) {
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_jlock), 1) ;
++ if (journal->j_trans_id == trans_id) {
++ atomic_set(&(journal->j_jlock), 1) ;
+ }
+ unlock_journal(p_s_sb);
+ }
+ }
+- if (SB_JOURNAL(p_s_sb)->j_trans_id == trans_id) {
++ if (journal->j_trans_id == trans_id) {
+ BUG();
+ }
+ if (commit_now && journal_list_still_alive(p_s_sb, trans_id) &&
+@@ -3104,22 +3138,22 @@
+
+ /* deal with old transactions where we are the last writers */
+ now = get_seconds();
+- if ((now - SB_JOURNAL(p_s_sb)->j_trans_start_time) > SB_JOURNAL_MAX_TRANS_AGE(p_s_sb)) {
++ if ((now - journal->j_trans_start_time) > journal->j_max_trans_age) {
+ commit_now = 1 ;
+- SB_JOURNAL(p_s_sb)->j_next_async_flush = 1 ;
++ journal->j_next_async_flush = 1 ;
+ }
+ /* don't batch when someone is waiting on j_join_wait */
+ /* don't batch when syncing the commit or flushing the whole trans */
+- if (!(SB_JOURNAL(p_s_sb)->j_must_wait > 0) && !(atomic_read(&(SB_JOURNAL(p_s_sb)->j_jlock))) && !flush && !commit_now &&
+- (SB_JOURNAL(p_s_sb)->j_len < SB_JOURNAL_MAX_BATCH(p_s_sb)) &&
+- SB_JOURNAL(p_s_sb)->j_len_alloc < SB_JOURNAL_MAX_BATCH(p_s_sb) && SB_JOURNAL(p_s_sb)->j_cnode_free > (SB_JOURNAL_TRANS_MAX(p_s_sb) * 3)) {
+- SB_JOURNAL(p_s_sb)->j_bcount++ ;
++ if (!(journal->j_must_wait > 0) && !(atomic_read(&(journal->j_jlock))) && !flush && !commit_now &&
++ (journal->j_len < journal->j_max_batch) &&
++ journal->j_len_alloc < journal->j_max_batch && journal->j_cnode_free > (journal->j_trans_max * 3)) {
++ journal->j_bcount++ ;
+ unlock_journal(p_s_sb) ;
+ return 0 ;
+ }
+
+- if (SB_JOURNAL(p_s_sb)->j_start > SB_ONDISK_JOURNAL_SIZE(p_s_sb)) {
+- reiserfs_panic(p_s_sb, "journal-003: journal_end: j_start (%ld) is too high\n", SB_JOURNAL(p_s_sb)->j_start) ;
++ if (journal->j_start > SB_ONDISK_JOURNAL_SIZE(p_s_sb)) {
++ reiserfs_panic(p_s_sb, "journal-003: journal_end: j_start (%ld) is too high\n", journal->j_start) ;
+ }
+ return 1 ;
+ }
+@@ -3139,12 +3173,13 @@
+ ** Then remove it from the current transaction, decrementing any counters and filing it on the clean list.
+ */
+ int journal_mark_freed(struct reiserfs_transaction_handle *th, struct super_block *p_s_sb, b_blocknr_t blocknr) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn = NULL ;
+ struct buffer_head *bh = NULL ;
+ struct reiserfs_list_bitmap *jb = NULL ;
+ int cleaned = 0 ;
+
+- cn = get_journal_hash_dev(p_s_sb, SB_JOURNAL(p_s_sb)->j_hash_table, blocknr);
++ cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, blocknr);
+ if (cn && cn->bh) {
+ bh = cn->bh ;
+ get_bh(bh) ;
+@@ -3157,7 +3192,7 @@
+ cleaned = remove_from_transaction(p_s_sb, blocknr, cleaned) ;
+ } else {
+ /* set the bit for this block in the journal bitmap for this transaction */
+- jb = SB_JOURNAL(p_s_sb)->j_current_jl->j_list_bitmap;
++ jb = journal->j_current_jl->j_list_bitmap;
+ if (!jb) {
+ reiserfs_panic(p_s_sb, "journal-1702: journal_mark_freed, journal_list_bitmap is NULL\n") ;
+ }
+@@ -3172,7 +3207,7 @@
+ cleaned = remove_from_transaction(p_s_sb, blocknr, cleaned) ;
+
+ /* find all older transactions with this block, make sure they don't try to write it out */
+- cn = get_journal_hash_dev(p_s_sb,SB_JOURNAL(p_s_sb)->j_list_hash_table, blocknr) ;
++ cn = get_journal_hash_dev(p_s_sb,journal->j_list_hash_table, blocknr) ;
+ while (cn) {
+ if (p_s_sb == cn->sb && blocknr == cn->blocknr) {
+ set_bit(BLOCK_FREED, &cn->state) ;
+@@ -3208,8 +3243,9 @@
+ }
+
+ void reiserfs_update_inode_transaction(struct inode *inode) {
+- REISERFS_I(inode)->i_jl = SB_JOURNAL(inode->i_sb)->j_current_jl;
+- REISERFS_I(inode)->i_trans_id = SB_JOURNAL(inode->i_sb)->j_trans_id ;
++ struct reiserfs_journal *journal = SB_JOURNAL (inode->i_sb);
++ REISERFS_I(inode)->i_jl = journal->j_current_jl;
++ REISERFS_I(inode)->i_trans_id = journal->j_trans_id ;
+ }
+
+ /*
+@@ -3221,21 +3257,22 @@
+ {
+ struct reiserfs_transaction_handle th ;
+ struct super_block *sb = inode->i_sb ;
++ struct reiserfs_journal *journal = SB_JOURNAL (sb);
+ int ret = 0;
+
+ /* is it from the current transaction, or from an unknown transaction? */
+- if (id == SB_JOURNAL(sb)->j_trans_id) {
+- jl = SB_JOURNAL(sb)->j_current_jl;
++ if (id == journal->j_trans_id) {
++ jl = journal->j_current_jl;
+ /* try to let other writers come in and grow this transaction */
+ let_transaction_grow(sb, id);
+- if (SB_JOURNAL(sb)->j_trans_id != id) {
++ if (journal->j_trans_id != id) {
+ goto flush_commit_only;
+ }
+
+ journal_begin(&th, sb, 1) ;
+
+ /* someone might have ended this transaction while we joined */
+- if (SB_JOURNAL(sb)->j_trans_id != id) {
++ if (journal->j_trans_id != id) {
+ reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb), 1) ;
+ journal_mark_dirty(&th, sb, SB_BUFFER_WITH_SB(sb)) ;
+ journal_end(&th, sb, 1) ;
+@@ -3284,6 +3321,7 @@
+
+ void reiserfs_restore_prepared_buffer(struct super_block *p_s_sb,
+ struct buffer_head *bh) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ PROC_INFO_INC( p_s_sb, journal.restore_prepared );
+ if (!bh) {
+ return ;
+@@ -3292,7 +3330,7 @@
+ buffer_journal_dirty(bh)) {
+ struct reiserfs_journal_cnode *cn;
+ cn = get_journal_hash_dev(p_s_sb,
+- SB_JOURNAL(p_s_sb)->j_list_hash_table,
++ journal->j_list_hash_table,
+ bh->b_blocknr);
+ if (cn && can_dirty(cn)) {
+ set_buffer_journal_test (bh);
+@@ -3329,12 +3367,13 @@
+ }
+
+ static void flush_old_journal_lists(struct super_block *s) {
++ struct reiserfs_journal *journal = SB_JOURNAL (s);
+ struct reiserfs_journal_list *jl;
+ struct list_head *entry;
+ time_t now = get_seconds();
+
+- while(!list_empty(&SB_JOURNAL(s)->j_journal_list)) {
+- entry = SB_JOURNAL(s)->j_journal_list.next;
++ while(!list_empty(&journal->j_journal_list)) {
++ entry = journal->j_journal_list.next;
+ jl = JOURNAL_LIST_ENTRY(entry);
+ /* this check should always be run, to send old lists to disk */
+ if (jl->j_timestamp < (now - (JOURNAL_MAX_TRANS_AGE * 4))) {
+@@ -3354,6 +3393,7 @@
+ */
+ static int do_journal_end(struct reiserfs_transaction_handle *th, struct super_block * p_s_sb, unsigned long nblocks,
+ int flags) {
++ struct reiserfs_journal *journal = SB_JOURNAL (p_s_sb);
+ struct reiserfs_journal_cnode *cn, *next, *jl_cn;
+ struct reiserfs_journal_cnode *last_cn = NULL;
+ struct reiserfs_journal_desc *desc ;
+@@ -3376,17 +3416,17 @@
+
+ current->journal_info = th->t_handle_save;
+ reiserfs_check_lock_depth(p_s_sb, "journal end");
+- if (SB_JOURNAL(p_s_sb)->j_len == 0) {
++ if (journal->j_len == 0) {
+ reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1) ;
+ journal_mark_dirty(th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb)) ;
+ }
+
+ lock_journal(p_s_sb) ;
+- if (SB_JOURNAL(p_s_sb)->j_next_full_flush) {
++ if (journal->j_next_full_flush) {
+ flags |= FLUSH_ALL ;
+ flush = 1 ;
+ }
+- if (SB_JOURNAL(p_s_sb)->j_next_async_flush) {
++ if (journal->j_next_async_flush) {
+ flags |= COMMIT_NOW | WAIT;
+ wait_on_commit = 1;
+ }
+@@ -3402,7 +3442,7 @@
+ }
+
+ /* check_journal_end might set these, check again */
+- if (SB_JOURNAL(p_s_sb)->j_next_full_flush) {
++ if (journal->j_next_full_flush) {
+ flush = 1 ;
+ }
+
+@@ -3410,7 +3450,7 @@
+ ** j must wait means we have to flush the log blocks, and the real blocks for
+ ** this transaction
+ */
+- if (SB_JOURNAL(p_s_sb)->j_must_wait > 0) {
++ if (journal->j_must_wait > 0) {
+ flush = 1 ;
+ }
+
+@@ -3423,23 +3463,23 @@
+ #endif
+
+ /* setup description block */
+- d_bh = journal_getblk(p_s_sb, SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + SB_JOURNAL(p_s_sb)->j_start) ;
++ d_bh = journal_getblk(p_s_sb, SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + journal->j_start) ;
+ set_buffer_uptodate(d_bh);
+ desc = (struct reiserfs_journal_desc *)(d_bh)->b_data ;
+ memset(d_bh->b_data, 0, d_bh->b_size) ;
+ memcpy(get_journal_desc_magic (d_bh), JOURNAL_DESC_MAGIC, 8) ;
+- set_desc_trans_id(desc, SB_JOURNAL(p_s_sb)->j_trans_id) ;
++ set_desc_trans_id(desc, journal->j_trans_id) ;
+
+ /* setup commit block. Don't write (keep it clean too) this one until after everyone else is written */
+ c_bh = journal_getblk(p_s_sb, SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
+- ((SB_JOURNAL(p_s_sb)->j_start + SB_JOURNAL(p_s_sb)->j_len + 1) % SB_ONDISK_JOURNAL_SIZE(p_s_sb))) ;
++ ((journal->j_start + journal->j_len + 1) % SB_ONDISK_JOURNAL_SIZE(p_s_sb))) ;
+ commit = (struct reiserfs_journal_commit *)c_bh->b_data ;
+ memset(c_bh->b_data, 0, c_bh->b_size) ;
+- set_commit_trans_id(commit, SB_JOURNAL(p_s_sb)->j_trans_id) ;
++ set_commit_trans_id(commit, journal->j_trans_id) ;
+ set_buffer_uptodate(c_bh) ;
+
+ /* init this journal list */
+- jl = SB_JOURNAL(p_s_sb)->j_current_jl;
++ jl = journal->j_current_jl;
+
+ /* we lock the commit before doing anything because
+ * we want to make sure nobody tries to run flush_commit_list until
+@@ -3452,13 +3492,13 @@
+ commit_trans_id = jl->j_trans_id;
+
+ atomic_set(&jl->j_older_commits_done, 0) ;
+- jl->j_trans_id = SB_JOURNAL(p_s_sb)->j_trans_id ;
+- jl->j_timestamp = SB_JOURNAL(p_s_sb)->j_trans_start_time ;
++ jl->j_trans_id = journal->j_trans_id ;
++ jl->j_timestamp = journal->j_trans_start_time ;
+ jl->j_commit_bh = c_bh ;
+- jl->j_start = SB_JOURNAL(p_s_sb)->j_start ;
+- jl->j_len = SB_JOURNAL(p_s_sb)->j_len ;
+- atomic_set(&jl->j_nonzerolen, SB_JOURNAL(p_s_sb)->j_len) ;
+- atomic_set(&jl->j_commit_left, SB_JOURNAL(p_s_sb)->j_len + 2);
++ jl->j_start = journal->j_start ;
++ jl->j_len = journal->j_len ;
++ atomic_set(&jl->j_nonzerolen, journal->j_len) ;
++ atomic_set(&jl->j_commit_left, journal->j_len + 2);
+ jl->j_realblock = NULL ;
+
+ /* The ENTIRE FOR LOOP MUST not cause schedule to occur.
+@@ -3466,7 +3506,7 @@
+ ** copy into real block index array in the commit or desc block
+ */
+ trans_half = journal_trans_half(p_s_sb->s_blocksize);
+- for (i = 0, cn = SB_JOURNAL(p_s_sb)->j_first ; cn ; cn = cn->next, i++) {
++ for (i = 0, cn = journal->j_first ; cn ; cn = cn->next, i++) {
+ if (buffer_journaled (cn->bh)) {
+ jl_cn = get_cnode(p_s_sb) ;
+ if (!jl_cn) {
+@@ -3492,7 +3532,7 @@
+ jl_cn->sb = p_s_sb;
+ jl_cn->bh = cn->bh ;
+ jl_cn->jlist = jl;
+- insert_journal_hash(SB_JOURNAL(p_s_sb)->j_list_hash_table, jl_cn) ;
++ insert_journal_hash(journal->j_list_hash_table, jl_cn) ;
+ if (i < trans_half) {
+ desc->j_realblock[i] = cpu_to_le32(cn->bh->b_blocknr) ;
+ } else {
+@@ -3502,13 +3542,13 @@
+ i-- ;
+ }
+ }
+- set_desc_trans_len(desc, SB_JOURNAL(p_s_sb)->j_len) ;
+- set_desc_mount_id(desc, SB_JOURNAL(p_s_sb)->j_mount_id) ;
+- set_desc_trans_id(desc, SB_JOURNAL(p_s_sb)->j_trans_id) ;
+- set_commit_trans_len(commit, SB_JOURNAL(p_s_sb)->j_len);
++ set_desc_trans_len(desc, journal->j_len) ;
++ set_desc_mount_id(desc, journal->j_mount_id) ;
++ set_desc_trans_id(desc, journal->j_trans_id) ;
++ set_commit_trans_len(commit, journal->j_len);
+
+ /* special check in case all buffers in the journal were marked for not logging */
+- if (SB_JOURNAL(p_s_sb)->j_len == 0) {
++ if (journal->j_len == 0) {
+ BUG();
+ }
+
+@@ -3519,8 +3559,8 @@
+ mark_buffer_dirty(d_bh);
+
+ /* first data block is j_start + 1, so add one to cur_write_start wherever you use it */
+- cur_write_start = SB_JOURNAL(p_s_sb)->j_start ;
+- cn = SB_JOURNAL(p_s_sb)->j_first ;
++ cur_write_start = journal->j_start ;
++ cn = journal->j_first ;
+ jindex = 1 ; /* start at one so we don't get the desc again */
+ while(cn) {
+ clear_buffer_journal_new (cn->bh);
+@@ -3557,28 +3597,28 @@
+ ** so we dirty/relse c_bh in flush_commit_list, with commit_left <= 1.
+ */
+
+- SB_JOURNAL(p_s_sb)->j_current_jl = alloc_journal_list(p_s_sb);
++ journal->j_current_jl = alloc_journal_list(p_s_sb);
+
+ /* now it is safe to insert this transaction on the main list */
+- list_add_tail(&jl->j_list, &SB_JOURNAL(p_s_sb)->j_journal_list);
+- list_add_tail(&jl->j_working_list, &SB_JOURNAL(p_s_sb)->j_working_list);
+- SB_JOURNAL(p_s_sb)->j_num_work_lists++;
++ list_add_tail(&jl->j_list, &journal->j_journal_list);
++ list_add_tail(&jl->j_working_list, &journal->j_working_list);
++ journal->j_num_work_lists++;
+
+ /* reset journal values for the next transaction */
+- old_start = SB_JOURNAL(p_s_sb)->j_start ;
+- SB_JOURNAL(p_s_sb)->j_start = (SB_JOURNAL(p_s_sb)->j_start + SB_JOURNAL(p_s_sb)->j_len + 2) % SB_ONDISK_JOURNAL_SIZE(p_s_sb);
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_wcount), 0) ;
+- SB_JOURNAL(p_s_sb)->j_bcount = 0 ;
+- SB_JOURNAL(p_s_sb)->j_last = NULL ;
+- SB_JOURNAL(p_s_sb)->j_first = NULL ;
+- SB_JOURNAL(p_s_sb)->j_len = 0 ;
+- SB_JOURNAL(p_s_sb)->j_trans_start_time = 0 ;
+- SB_JOURNAL(p_s_sb)->j_trans_id++ ;
+- SB_JOURNAL(p_s_sb)->j_current_jl->j_trans_id = SB_JOURNAL(p_s_sb)->j_trans_id;
+- SB_JOURNAL(p_s_sb)->j_must_wait = 0 ;
+- SB_JOURNAL(p_s_sb)->j_len_alloc = 0 ;
+- SB_JOURNAL(p_s_sb)->j_next_full_flush = 0 ;
+- SB_JOURNAL(p_s_sb)->j_next_async_flush = 0 ;
++ old_start = journal->j_start ;
++ journal->j_start = (journal->j_start + journal->j_len + 2) % SB_ONDISK_JOURNAL_SIZE(p_s_sb);
++ atomic_set(&(journal->j_wcount), 0) ;
++ journal->j_bcount = 0 ;
++ journal->j_last = NULL ;
++ journal->j_first = NULL ;
++ journal->j_len = 0 ;
++ journal->j_trans_start_time = 0 ;
++ journal->j_trans_id++ ;
++ journal->j_current_jl->j_trans_id = journal->j_trans_id;
++ journal->j_must_wait = 0 ;
++ journal->j_len_alloc = 0 ;
++ journal->j_next_full_flush = 0 ;
++ journal->j_next_async_flush = 0 ;
+ init_journal_hash(p_s_sb) ;
+
+ // make sure reiserfs_add_jh sees the new current_jl before we
+@@ -3593,8 +3633,8 @@
+ */
+ if (!list_empty(&jl->j_tail_bh_list)) {
+ unlock_kernel();
+- write_ordered_buffers(&SB_JOURNAL(p_s_sb)->j_dirty_buffers_lock,
+- SB_JOURNAL(p_s_sb), jl, &jl->j_tail_bh_list);
++ write_ordered_buffers(&journal->j_dirty_buffers_lock,
++ journal, jl, &jl->j_tail_bh_list);
+ lock_kernel();
+ }
+ if (!list_empty(&jl->j_tail_bh_list))
+@@ -3612,7 +3652,7 @@
+ flush_commit_list(p_s_sb, jl, 1) ;
+ flush_journal_list(p_s_sb, jl, 1) ;
+ } else if (!(jl->j_state & LIST_COMMIT_PENDING))
+- queue_delayed_work(commit_wq, &SB_JOURNAL(p_s_sb)->j_work, HZ/10);
++ queue_delayed_work(commit_wq, &journal->j_work, HZ/10);
+
+
+ /* if the next transaction has any chance of wrapping, flush
+@@ -3620,16 +3660,16 @@
+ ** old flush them as well.
+ */
+ first_jl:
+- list_for_each_safe(entry, safe, &SB_JOURNAL(p_s_sb)->j_journal_list) {
++ list_for_each_safe(entry, safe, &journal->j_journal_list) {
+ temp_jl = JOURNAL_LIST_ENTRY(entry);
+- if (SB_JOURNAL(p_s_sb)->j_start <= temp_jl->j_start) {
+- if ((SB_JOURNAL(p_s_sb)->j_start + SB_JOURNAL_TRANS_MAX(p_s_sb) + 1) >=
++ if (journal->j_start <= temp_jl->j_start) {
++ if ((journal->j_start + journal->j_trans_max + 1) >=
+ temp_jl->j_start)
+ {
+ flush_used_journal_lists(p_s_sb, temp_jl);
+ goto first_jl;
+- } else if ((SB_JOURNAL(p_s_sb)->j_start +
+- SB_JOURNAL_TRANS_MAX(p_s_sb) + 1) <
++ } else if ((journal->j_start +
++ journal->j_trans_max + 1) <
+ SB_ONDISK_JOURNAL_SIZE(p_s_sb))
+ {
+ /* if we don't cross into the next transaction and we don't
+@@ -3638,11 +3678,11 @@
+ */
+ break;
+ }
+- } else if ((SB_JOURNAL(p_s_sb)->j_start +
+- SB_JOURNAL_TRANS_MAX(p_s_sb) + 1) >
++ } else if ((journal->j_start +
++ journal->j_trans_max + 1) >
+ SB_ONDISK_JOURNAL_SIZE(p_s_sb))
+ {
+- if (((SB_JOURNAL(p_s_sb)->j_start + SB_JOURNAL_TRANS_MAX(p_s_sb) + 1) %
++ if (((journal->j_start + journal->j_trans_max + 1) %
+ SB_ONDISK_JOURNAL_SIZE(p_s_sb)) >= temp_jl->j_start)
+ {
+ flush_used_journal_lists(p_s_sb, temp_jl);
+@@ -3658,17 +3698,17 @@
+ }
+ flush_old_journal_lists(p_s_sb);
+
+- SB_JOURNAL(p_s_sb)->j_current_jl->j_list_bitmap = get_list_bitmap(p_s_sb, SB_JOURNAL(p_s_sb)->j_current_jl) ;
++ journal->j_current_jl->j_list_bitmap = get_list_bitmap(p_s_sb, journal->j_current_jl) ;
+
+- if (!(SB_JOURNAL(p_s_sb)->j_current_jl->j_list_bitmap)) {
++ if (!(journal->j_current_jl->j_list_bitmap)) {
+ reiserfs_panic(p_s_sb, "journal-1996: do_journal_end, could not get a list bitmap\n") ;
+ }
+
+- atomic_set(&(SB_JOURNAL(p_s_sb)->j_jlock), 0) ;
++ atomic_set(&(journal->j_jlock), 0) ;
+ unlock_journal(p_s_sb) ;
+ /* wake up any body waiting to join. */
+- clear_bit(WRITERS_QUEUED, &SB_JOURNAL(p_s_sb)->j_state);
+- wake_up(&(SB_JOURNAL(p_s_sb)->j_join_wait)) ;
++ clear_bit(WRITERS_QUEUED, &journal->j_state);
++ wake_up(&(journal->j_join_wait)) ;
+
+ if (!flush && wait_on_commit &&
+ journal_list_still_alive(p_s_sb, commit_trans_id)) {
+diff -Nru a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
+--- a/fs/reiserfs/procfs.c 2004-12-23 01:01:06 -08:00
++++ b/fs/reiserfs/procfs.c 2004-12-23 01:01:06 -08:00
+@@ -399,7 +399,7 @@
+ DJP( jp_journal_trans_max ),
+ DJP( jp_journal_magic ),
+ DJP( jp_journal_max_batch ),
+- SB_JOURNAL_MAX_COMMIT_AGE(sb),
++ SB_JOURNAL(sb)->j_max_commit_age,
+ DJP( jp_journal_max_trans_age ),
+
+ JF( j_1st_reserved_block ),
+diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
+--- a/fs/reiserfs/super.c 2004-12-23 01:01:06 -08:00
++++ b/fs/reiserfs/super.c 2004-12-23 01:01:06 -08:00
+@@ -861,6 +861,7 @@
+ unsigned long mount_options = REISERFS_SB(s)->s_mount_opt;
+ unsigned long safe_mask = 0;
+ unsigned int commit_max_age = (unsigned int)-1;
++ struct reiserfs_journal *journal = SB_JOURNAL(s);
+
+ rs = SB_DISK_SUPER_BLOCK (s);
+
+@@ -887,14 +888,14 @@
+ REISERFS_SB(s)->s_mount_opt = (REISERFS_SB(s)->s_mount_opt & ~safe_mask) | (mount_options & safe_mask);
+
+ if(commit_max_age != 0 && commit_max_age != (unsigned int)-1) {
+- SB_JOURNAL_MAX_COMMIT_AGE(s) = commit_max_age;
+- SB_JOURNAL_MAX_TRANS_AGE(s) = commit_max_age;
++ journal->j_max_commit_age = commit_max_age;
++ journal->j_max_trans_age = commit_max_age;
+ }
+ else if(commit_max_age == 0)
+ {
+ /* 0 means restore defaults. */
+- SB_JOURNAL_MAX_COMMIT_AGE(s) = SB_JOURNAL_DEFAULT_MAX_COMMIT_AGE(s);
+- SB_JOURNAL_MAX_TRANS_AGE(s) = JOURNAL_MAX_TRANS_AGE;
++ journal->j_max_commit_age = journal->j_default_max_commit_age;
++ journal->j_max_trans_age = JOURNAL_MAX_TRANS_AGE;
+ }
+
+ if(blocks) {
+diff -Nru a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
+--- a/include/linux/reiserfs_fs_sb.h 2004-12-23 01:01:06 -08:00
++++ b/include/linux/reiserfs_fs_sb.h 2004-12-23 01:01:06 -08:00
+@@ -206,11 +206,11 @@
+ int j_cnode_used ; /* number of cnodes on the used list */
+ int j_cnode_free ; /* number of cnodes on the free list */
+
+- unsigned int s_journal_trans_max ; /* max number of blocks in a transaction. */
+- unsigned int s_journal_max_batch ; /* max number of blocks to batch into a trans */
+- unsigned int s_journal_max_commit_age ; /* in seconds, how old can an async commit be */
+- unsigned int s_journal_default_max_commit_age ; /* the default for the max commit age */
+- unsigned int s_journal_max_trans_age ; /* in seconds, how old can a transaction be */
++ unsigned int j_trans_max ; /* max number of blocks in a transaction. */
++ unsigned int j_max_batch ; /* max number of blocks to batch into a trans */
++ unsigned int j_max_commit_age ; /* in seconds, how old can an async commit be */
++ unsigned int j_max_trans_age ; /* in seconds, how old can a transaction be */
++ unsigned int j_default_max_commit_age ; /* the default for the max commit age */
+
+ struct reiserfs_journal_cnode *j_cnode_free_list ;
+ struct reiserfs_journal_cnode *j_cnode_free_orig ; /* orig pointer returned from vmalloc */
+@@ -493,12 +493,6 @@
+ #define SB_AP_BITMAP(s) (REISERFS_SB(s)->s_ap_bitmap)
+
+ #define SB_DISK_JOURNAL_HEAD(s) (SB_JOURNAL(s)->j_header_bh->)
+-
+-#define SB_JOURNAL_TRANS_MAX(s) (SB_JOURNAL(s)->s_journal_trans_max)
+-#define SB_JOURNAL_MAX_BATCH(s) (SB_JOURNAL(s)->s_journal_max_batch)
+-#define SB_JOURNAL_MAX_COMMIT_AGE(s) (SB_JOURNAL(s)->s_journal_max_commit_age)
+-#define SB_JOURNAL_DEFAULT_MAX_COMMIT_AGE(s) (SB_JOURNAL(s)->s_journal_default_max_commit_age)
+-#define SB_JOURNAL_MAX_TRANS_AGE(s) (SB_JOURNAL(s)->s_journal_max_trans_age)
+
+ /* A safe version of the "bdevname", which returns the "s_id" field of
+ * a superblock or else "Null superblock" if the super block is NULL.
Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11 2004-12-23 09:03:11 UTC (rev 2029)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11 2004-12-23 09:05:14 UTC (rev 2030)
@@ -13,6 +13,7 @@
+ ip-conntrack-ftp-leak.dpatch
+ reiserfs-sucks.dpatch
+ reiserfs-sucks-2.dpatch
++ reiserfs-sucks-3.dpatch
+ fix-ip-options-leak.dpatch
+ vt-of-death.dpatch
+ drivers-usb-storage-revoltec.dpatch