--- /dev/null
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: reiserfs: rename p_s_sb to sb
+
+ This patch is a simple s/p_s_sb/sb/g to the reiserfs code. This is the first
+ in a series of patches to rip out some of the awful variable naming in
+ reiserfs.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+
+---
+
+ fs/reiserfs/fix_node.c | 46 +-
+ fs/reiserfs/fix_node.c | 46 +-
+ fs/reiserfs/journal.c | 735 ++++++++++++++++++++----------------------
+ fs/reiserfs/stree.c | 126 +++----
+ fs/reiserfs/tail_conversion.c | 16
+ include/linux/reiserfs_fs.h | 14
+ 5 files changed, 468 insertions(+), 469 deletions(-)
+
+--- a/fs/reiserfs/fix_node.c
++++ b/fs/reiserfs/fix_node.c
+@@ -785,7 +785,7 @@ static int get_empty_nodes(struct tree_b
+ b_blocknr_t *p_n_blocknr, a_n_blocknrs[MAX_AMOUNT_NEEDED] = { 0, };
+ int n_counter, n_number_of_freeblk, n_amount_needed, /* number of needed empty blocks */
+ n_retval = CARRY_ON;
+- struct super_block *p_s_sb = p_s_tb->tb_sb;
++ struct super_block *sb = p_s_tb->tb_sb;
+
+ /* number_of_freeblk is the number of empty blocks which have been
+ acquired for use by the balancing algorithm minus the number of
+@@ -830,7 +830,7 @@ static int get_empty_nodes(struct tree_b
+ RFALSE(!*p_n_blocknr,
+ "PAP-8135: reiserfs_new_blocknrs failed when got new blocks");
+
+- p_s_new_bh = sb_getblk(p_s_sb, *p_n_blocknr);
++ p_s_new_bh = sb_getblk(sb, *p_n_blocknr);
+ RFALSE(buffer_dirty(p_s_new_bh) ||
+ buffer_journaled(p_s_new_bh) ||
+ buffer_journal_dirty(p_s_new_bh),
+@@ -899,7 +899,7 @@ static int get_rfree(struct tree_balance
+ static int is_left_neighbor_in_cache(struct tree_balance *p_s_tb, int n_h)
+ {
+ struct buffer_head *p_s_father, *left;
+- struct super_block *p_s_sb = p_s_tb->tb_sb;
++ struct super_block *sb = p_s_tb->tb_sb;
+ b_blocknr_t n_left_neighbor_blocknr;
+ int n_left_neighbor_position;
+
+@@ -924,7 +924,7 @@ static int is_left_neighbor_in_cache(str
+ n_left_neighbor_blocknr =
+ B_N_CHILD_NUM(p_s_tb->FL[n_h], n_left_neighbor_position);
+ /* Look for the left neighbor in the cache. */
+- if ((left = sb_find_get_block(p_s_sb, n_left_neighbor_blocknr))) {
++ if ((left = sb_find_get_block(sb, n_left_neighbor_blocknr))) {
+
+ RFALSE(buffer_uptodate(left) && !B_IS_IN_TREE(left),
+ "vs-8170: left neighbor (%b %z) is not in the tree",
+@@ -1942,14 +1942,14 @@ static int get_neighbors(struct tree_bal
+ int n_child_position,
+ n_path_offset = PATH_H_PATH_OFFSET(p_s_tb->tb_path, n_h + 1);
+ unsigned long n_son_number;
+- struct super_block *p_s_sb = p_s_tb->tb_sb;
++ struct super_block *sb = p_s_tb->tb_sb;
+ struct buffer_head *p_s_bh;
+
+- PROC_INFO_INC(p_s_sb, get_neighbors[n_h]);
++ PROC_INFO_INC(sb, get_neighbors[n_h]);
+
+ if (p_s_tb->lnum[n_h]) {
+ /* We need left neighbor to balance S[n_h]. */
+- PROC_INFO_INC(p_s_sb, need_l_neighbor[n_h]);
++ PROC_INFO_INC(sb, need_l_neighbor[n_h]);
+ p_s_bh = PATH_OFFSET_PBUFFER(p_s_tb->tb_path, n_path_offset);
+
+ RFALSE(p_s_bh == p_s_tb->FL[n_h] &&
+@@ -1961,12 +1961,12 @@ static int get_neighbors(struct tree_bal
+ p_s_tb->FL[n_h]) ? p_s_tb->lkey[n_h] : B_NR_ITEMS(p_s_tb->
+ FL[n_h]);
+ n_son_number = B_N_CHILD_NUM(p_s_tb->FL[n_h], n_child_position);
+- p_s_bh = sb_bread(p_s_sb, n_son_number);
++ p_s_bh = sb_bread(sb, n_son_number);
+ if (!p_s_bh)
+ return IO_ERROR;
+ if (FILESYSTEM_CHANGED_TB(p_s_tb)) {
+ brelse(p_s_bh);
+- PROC_INFO_INC(p_s_sb, get_neighbors_restart[n_h]);
++ PROC_INFO_INC(sb, get_neighbors_restart[n_h]);
+ return REPEAT_SEARCH;
+ }
+
+@@ -1986,7 +1986,7 @@ static int get_neighbors(struct tree_bal
+ }
+
+ if (p_s_tb->rnum[n_h]) { /* We need right neighbor to balance S[n_path_offset]. */
+- PROC_INFO_INC(p_s_sb, need_r_neighbor[n_h]);
++ PROC_INFO_INC(sb, need_r_neighbor[n_h]);
+ p_s_bh = PATH_OFFSET_PBUFFER(p_s_tb->tb_path, n_path_offset);
+
+ RFALSE(p_s_bh == p_s_tb->FR[n_h] &&
+@@ -1998,12 +1998,12 @@ static int get_neighbors(struct tree_bal
+ n_child_position =
+ (p_s_bh == p_s_tb->FR[n_h]) ? p_s_tb->rkey[n_h] + 1 : 0;
+ n_son_number = B_N_CHILD_NUM(p_s_tb->FR[n_h], n_child_position);
+- p_s_bh = sb_bread(p_s_sb, n_son_number);
++ p_s_bh = sb_bread(sb, n_son_number);
+ if (!p_s_bh)
+ return IO_ERROR;
+ if (FILESYSTEM_CHANGED_TB(p_s_tb)) {
+ brelse(p_s_bh);
+- PROC_INFO_INC(p_s_sb, get_neighbors_restart[n_h]);
++ PROC_INFO_INC(sb, get_neighbors_restart[n_h]);
+ return REPEAT_SEARCH;
+ }
+ brelse(p_s_tb->R[n_h]);
+@@ -2089,51 +2089,51 @@ static int get_mem_for_virtual_node(stru
+ }
+
+ #ifdef CONFIG_REISERFS_CHECK
+-static void tb_buffer_sanity_check(struct super_block *p_s_sb,
++static void tb_buffer_sanity_check(struct super_block *sb,
+ struct buffer_head *p_s_bh,
+ const char *descr, int level)
+ {
+ if (p_s_bh) {
+ if (atomic_read(&(p_s_bh->b_count)) <= 0) {
+
+- reiserfs_panic(p_s_sb, "jmacd-1", "negative or zero "
++ reiserfs_panic(sb, "jmacd-1", "negative or zero "
+ "reference counter for buffer %s[%d] "
+ "(%b)", descr, level, p_s_bh);
+ }
+
+ if (!buffer_uptodate(p_s_bh)) {
+- reiserfs_panic(p_s_sb, "jmacd-2", "buffer is not up "
++ reiserfs_panic(sb, "jmacd-2", "buffer is not up "
+ "to date %s[%d] (%b)",
+ descr, level, p_s_bh);
+ }
+
+ if (!B_IS_IN_TREE(p_s_bh)) {
+- reiserfs_panic(p_s_sb, "jmacd-3", "buffer is not "
++ reiserfs_panic(sb, "jmacd-3", "buffer is not "
+ "in tree %s[%d] (%b)",
+ descr, level, p_s_bh);
+ }
+
+- if (p_s_bh->b_bdev != p_s_sb->s_bdev) {
+- reiserfs_panic(p_s_sb, "jmacd-4", "buffer has wrong "
++ if (p_s_bh->b_bdev != sb->s_bdev) {
++ reiserfs_panic(sb, "jmacd-4", "buffer has wrong "
+ "device %s[%d] (%b)",
+ descr, level, p_s_bh);
+ }
+
+- if (p_s_bh->b_size != p_s_sb->s_blocksize) {
+- reiserfs_panic(p_s_sb, "jmacd-5", "buffer has wrong "
++ if (p_s_bh->b_size != sb->s_blocksize) {
++ reiserfs_panic(sb, "jmacd-5", "buffer has wrong "
+ "blocksize %s[%d] (%b)",
+ descr, level, p_s_bh);
+ }
+
+- if (p_s_bh->b_blocknr > SB_BLOCK_COUNT(p_s_sb)) {
+- reiserfs_panic(p_s_sb, "jmacd-6", "buffer block "
++ if (p_s_bh->b_blocknr > SB_BLOCK_COUNT(sb)) {
++ reiserfs_panic(sb, "jmacd-6", "buffer block "
+ "number too high %s[%d] (%b)",
+ descr, level, p_s_bh);
+ }
+ }
+ }
+ #else
+-static void tb_buffer_sanity_check(struct super_block *p_s_sb,
++static void tb_buffer_sanity_check(struct super_block *sb,
+ struct buffer_head *p_s_bh,
+ const char *descr, int level)
+ {;
+--- a/fs/reiserfs/journal.c
++++ b/fs/reiserfs/journal.c
+@@ -97,7 +97,7 @@ static int flush_commit_list(struct supe
+ struct reiserfs_journal_list *jl, int flushall);
+ static int can_dirty(struct reiserfs_journal_cnode *cn);
+ static int journal_join(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks);
++ struct super_block *sb, unsigned long nblocks);
+ static int release_journal_dev(struct super_block *super,
+ struct reiserfs_journal *journal);
+ static int dirty_one_transaction(struct super_block *s,
+@@ -113,12 +113,12 @@ enum {
+ };
+
+ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb,
++ struct super_block *sb,
+ unsigned long nblocks, int join);
+
+-static void init_journal_hash(struct super_block *p_s_sb)
++static void init_journal_hash(struct super_block *sb)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ memset(journal->j_hash_table, 0,
+ JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *));
+ }
+@@ -145,7 +145,7 @@ static void disable_barrier(struct super
+ }
+
+ static struct reiserfs_bitmap_node *allocate_bitmap_node(struct super_block
+- *p_s_sb)
++ *sb)
+ {
+ struct reiserfs_bitmap_node *bn;
+ static int id;
+@@ -154,7 +154,7 @@ static struct reiserfs_bitmap_node *allo
+ if (!bn) {
+ return NULL;
+ }
+- bn->data = kzalloc(p_s_sb->s_blocksize, GFP_NOFS);
++ bn->data = kzalloc(sb->s_blocksize, GFP_NOFS);
+ if (!bn->data) {
+ kfree(bn);
+ return NULL;
+@@ -164,9 +164,9 @@ static struct reiserfs_bitmap_node *allo
+ return bn;
+ }
+
+-static struct reiserfs_bitmap_node *get_bitmap_node(struct super_block *p_s_sb)
++static struct reiserfs_bitmap_node *get_bitmap_node(struct super_block *sb)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_bitmap_node *bn = NULL;
+ struct list_head *entry = journal->j_bitmap_nodes.next;
+
+@@ -176,21 +176,21 @@ static struct reiserfs_bitmap_node *get_
+ 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);
++ memset(bn->data, 0, sb->s_blocksize);
+ journal->j_free_bitmap_nodes--;
+ return bn;
+ }
+- bn = allocate_bitmap_node(p_s_sb);
++ bn = allocate_bitmap_node(sb);
+ if (!bn) {
+ yield();
+ goto repeat;
+ }
+ return bn;
+ }
+-static inline void free_bitmap_node(struct super_block *p_s_sb,
++static inline void free_bitmap_node(struct super_block *sb,
+ struct reiserfs_bitmap_node *bn)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ journal->j_used_bitmap_nodes--;
+ if (journal->j_free_bitmap_nodes > REISERFS_MAX_BITMAP_NODES) {
+ kfree(bn->data);
+@@ -201,13 +201,13 @@ static inline void free_bitmap_node(stru
+ }
+ }
+
+-static void allocate_bitmap_nodes(struct super_block *p_s_sb)
++static void allocate_bitmap_nodes(struct super_block *sb)
+ {
+ int i;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_bitmap_node *bn = NULL;
+ for (i = 0; i < REISERFS_MIN_BITMAP_NODES; i++) {
+- bn = allocate_bitmap_node(p_s_sb);
++ bn = allocate_bitmap_node(sb);
+ if (bn) {
+ list_add(&bn->list, &journal->j_bitmap_nodes);
+ journal->j_free_bitmap_nodes++;
+@@ -217,30 +217,30 @@ static void allocate_bitmap_nodes(struct
+ }
+ }
+
+-static int set_bit_in_list_bitmap(struct super_block *p_s_sb,
++static int set_bit_in_list_bitmap(struct super_block *sb,
+ b_blocknr_t block,
+ struct reiserfs_list_bitmap *jb)
+ {
+- unsigned int bmap_nr = block / (p_s_sb->s_blocksize << 3);
+- unsigned int bit_nr = block % (p_s_sb->s_blocksize << 3);
++ unsigned int bmap_nr = block / (sb->s_blocksize << 3);
++ unsigned int bit_nr = block % (sb->s_blocksize << 3);
+
+ if (!jb->bitmaps[bmap_nr]) {
+- jb->bitmaps[bmap_nr] = get_bitmap_node(p_s_sb);
++ jb->bitmaps[bmap_nr] = get_bitmap_node(sb);
+ }
+ set_bit(bit_nr, (unsigned long *)jb->bitmaps[bmap_nr]->data);
+ return 0;
+ }
+
+-static void cleanup_bitmap_list(struct super_block *p_s_sb,
++static void cleanup_bitmap_list(struct super_block *sb,
+ struct reiserfs_list_bitmap *jb)
+ {
+ int i;
+ if (jb->bitmaps == NULL)
+ return;
+
+- for (i = 0; i < reiserfs_bmap_count(p_s_sb); i++) {
++ for (i = 0; i < reiserfs_bmap_count(sb); i++) {
+ if (jb->bitmaps[i]) {
+- free_bitmap_node(p_s_sb, jb->bitmaps[i]);
++ free_bitmap_node(sb, jb->bitmaps[i]);
+ jb->bitmaps[i] = NULL;
+ }
+ }
+@@ -249,7 +249,7 @@ static void cleanup_bitmap_list(struct s
+ /*
+ ** only call this on FS unmount.
+ */
+-static int free_list_bitmaps(struct super_block *p_s_sb,
++static int free_list_bitmaps(struct super_block *sb,
+ struct reiserfs_list_bitmap *jb_array)
+ {
+ int i;
+@@ -257,16 +257,16 @@ static int free_list_bitmaps(struct supe
+ for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) {
+ jb = jb_array + i;
+ jb->journal_list = NULL;
+- cleanup_bitmap_list(p_s_sb, jb);
++ cleanup_bitmap_list(sb, jb);
+ vfree(jb->bitmaps);
+ jb->bitmaps = NULL;
+ }
+ return 0;
+ }
+
+-static int free_bitmap_nodes(struct super_block *p_s_sb)
++static int free_bitmap_nodes(struct super_block *sb)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct list_head *next = journal->j_bitmap_nodes.next;
+ struct reiserfs_bitmap_node *bn;
+
+@@ -286,7 +286,7 @@ static int free_bitmap_nodes(struct supe
+ ** get memory for JOURNAL_NUM_BITMAPS worth of bitmaps.
+ ** jb_array is the array to be filled in.
+ */
+-int reiserfs_allocate_list_bitmaps(struct super_block *p_s_sb,
++int reiserfs_allocate_list_bitmaps(struct super_block *sb,
+ struct reiserfs_list_bitmap *jb_array,
+ unsigned int bmap_nr)
+ {
+@@ -300,7 +300,7 @@ int reiserfs_allocate_list_bitmaps(struc
+ jb->journal_list = NULL;
+ jb->bitmaps = vmalloc(mem);
+ if (!jb->bitmaps) {
+- reiserfs_warning(p_s_sb, "clm-2000", "unable to "
++ reiserfs_warning(sb, "clm-2000", "unable to "
+ "allocate bitmaps for journal lists");
+ failed = 1;
+ break;
+@@ -308,7 +308,7 @@ int reiserfs_allocate_list_bitmaps(struc
+ memset(jb->bitmaps, 0, mem);
+ }
+ if (failed) {
+- free_list_bitmaps(p_s_sb, jb_array);
++ free_list_bitmaps(sb, jb_array);
+ return -1;
+ }
+ return 0;
+@@ -318,12 +318,12 @@ int reiserfs_allocate_list_bitmaps(struc
+ ** find an available list bitmap. If you can't find one, flush a commit list
+ ** and try again
+ */
+-static struct reiserfs_list_bitmap *get_list_bitmap(struct super_block *p_s_sb,
++static struct reiserfs_list_bitmap *get_list_bitmap(struct super_block *sb,
+ struct reiserfs_journal_list
+ *jl)
+ {
+ int i, j;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_list_bitmap *jb = NULL;
+
+ for (j = 0; j < (JOURNAL_NUM_BITMAPS * 3); j++) {
+@@ -331,7 +331,7 @@ static struct reiserfs_list_bitmap *get_
+ 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,
++ flush_commit_list(sb,
+ journal->j_list_bitmap[i].
+ journal_list, 1);
+ if (!journal->j_list_bitmap[i].journal_list) {
+@@ -378,12 +378,12 @@ static struct reiserfs_journal_cnode *al
+ /*
+ ** pulls a cnode off the free list, or returns NULL on failure
+ */
+-static struct reiserfs_journal_cnode *get_cnode(struct super_block *p_s_sb)
++static struct reiserfs_journal_cnode *get_cnode(struct super_block *sb)
+ {
+ struct reiserfs_journal_cnode *cn;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+- reiserfs_check_lock_depth(p_s_sb, "get_cnode");
++ reiserfs_check_lock_depth(sb, "get_cnode");
+
+ if (journal->j_cnode_free <= 0) {
+ return NULL;
+@@ -405,12 +405,12 @@ static struct reiserfs_journal_cnode *ge
+ /*
+ ** returns a cnode to the free list
+ */
+-static void free_cnode(struct super_block *p_s_sb,
++static void free_cnode(struct super_block *sb,
+ struct reiserfs_journal_cnode *cn)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+- reiserfs_check_lock_depth(p_s_sb, "free_cnode");
++ reiserfs_check_lock_depth(sb, "free_cnode");
+
+ journal->j_cnode_used--;
+ journal->j_cnode_free++;
+@@ -481,11 +481,11 @@ static inline struct reiserfs_journal_cn
+ ** reject it on the next call to reiserfs_in_journal
+ **
+ */
+-int reiserfs_in_journal(struct super_block *p_s_sb,
++int reiserfs_in_journal(struct super_block *sb,
+ unsigned 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 *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_cnode *cn;
+ struct reiserfs_list_bitmap *jb;
+ int i;
+@@ -493,14 +493,14 @@ int reiserfs_in_journal(struct super_blo
+
+ *next_zero_bit = 0; /* always start this at zero. */
+
+- PROC_INFO_INC(p_s_sb, journal.in_journal);
++ PROC_INFO_INC(sb, journal.in_journal);
+ /* If we aren't doing a search_all, this is a metablock, and it will be logged before use.
+ ** if we crash before the transaction that freed it commits, this transaction won't
+ ** have committed either, and the block will never be written
+ */
+ if (search_all) {
+ for (i = 0; i < JOURNAL_NUM_BITMAPS; i++) {
+- PROC_INFO_INC(p_s_sb, journal.in_journal_bitmap);
++ PROC_INFO_INC(sb, journal.in_journal_bitmap);
+ jb = journal->j_list_bitmap + i;
+ if (jb->journal_list && jb->bitmaps[bmap_nr] &&
+ test_bit(bit_nr,
+@@ -510,28 +510,28 @@ int reiserfs_in_journal(struct super_blo
+ find_next_zero_bit((unsigned long *)
+ (jb->bitmaps[bmap_nr]->
+ data),
+- p_s_sb->s_blocksize << 3,
++ sb->s_blocksize << 3,
+ bit_nr + 1);
+ return 1;
+ }
+ }
+ }
+
+- bl = bmap_nr * (p_s_sb->s_blocksize << 3) + bit_nr;
++ bl = bmap_nr * (sb->s_blocksize << 3) + bit_nr;
+ /* is it in any old transactions? */
+ if (search_all
+ && (cn =
+- get_journal_hash_dev(p_s_sb, journal->j_list_hash_table, bl))) {
++ get_journal_hash_dev(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, journal->j_hash_table, bl))) {
++ if ((cn = get_journal_hash_dev(sb, journal->j_hash_table, bl))) {
+ BUG();
+ return 1;
+ }
+
+- PROC_INFO_INC(p_s_sb, journal.in_journal_reusable);
++ PROC_INFO_INC(sb, journal.in_journal_reusable);
+ /* safe for reuse */
+ return 0;
+ }
+@@ -553,16 +553,16 @@ static inline void insert_journal_hash(s
+ }
+
+ /* lock the current transaction */
+-static inline void lock_journal(struct super_block *p_s_sb)
++static inline void lock_journal(struct super_block *sb)
+ {
+- PROC_INFO_INC(p_s_sb, journal.lock_journal);
+- mutex_lock(&SB_JOURNAL(p_s_sb)->j_mutex);
++ PROC_INFO_INC(sb, journal.lock_journal);
++ mutex_lock(&SB_JOURNAL(sb)->j_mutex);
+ }
+
+ /* unlock the current transaction */
+-static inline void unlock_journal(struct super_block *p_s_sb)
++static inline void unlock_journal(struct super_block *sb)
+ {
+- mutex_unlock(&SB_JOURNAL(p_s_sb)->j_mutex);
++ mutex_unlock(&SB_JOURNAL(sb)->j_mutex);
+ }
+
+ static inline void get_journal_list(struct reiserfs_journal_list *jl)
+@@ -586,13 +586,13 @@ static inline void put_journal_list(stru
+ ** it gets called by flush_commit_list, and cleans up any data stored about blocks freed during a
+ ** transaction.
+ */
+-static void cleanup_freed_for_journal_list(struct super_block *p_s_sb,
++static void cleanup_freed_for_journal_list(struct super_block *sb,
+ struct reiserfs_journal_list *jl)
+ {
+
+ struct reiserfs_list_bitmap *jb = jl->j_list_bitmap;
+ if (jb) {
+- cleanup_bitmap_list(p_s_sb, jb);
++ cleanup_bitmap_list(sb, jb);
+ }
+ jl->j_list_bitmap->journal_list = NULL;
+ jl->j_list_bitmap = NULL;
+@@ -1237,11 +1237,11 @@ static void remove_journal_hash(struct s
+ ** journal list for this transaction. Aside from freeing the cnode, this also allows the
+ ** 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,
++static void remove_all_from_journal_list(struct super_block *sb,
+ struct reiserfs_journal_list *jl,
+ int debug)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_cnode *cn, *last;
+ cn = jl->j_realblock;
+
+@@ -1251,18 +1251,18 @@ static void remove_all_from_journal_list
+ while (cn) {
+ if (cn->blocknr != 0) {
+ if (debug) {
+- reiserfs_warning(p_s_sb, "reiserfs-2201",
++ reiserfs_warning(sb, "reiserfs-2201",
+ "block %u, bh is %d, state %ld",
+ cn->blocknr, cn->bh ? 1 : 0,
+ cn->state);
+ }
+ cn->state = 0;
+- remove_journal_hash(p_s_sb, journal->j_list_hash_table,
++ remove_journal_hash(sb, journal->j_list_hash_table,
+ jl, cn->blocknr, 1);
+ }
+ last = cn;
+ cn = cn->next;
+- free_cnode(p_s_sb, last);
++ free_cnode(sb, last);
+ }
+ jl->j_realblock = NULL;
+ }
+@@ -1274,12 +1274,12 @@ static void remove_all_from_journal_list
+ ** called by flush_journal_list, before it calls remove_all_from_journal_list
+ **
+ */
+-static int _update_journal_header_block(struct super_block *p_s_sb,
++static int _update_journal_header_block(struct super_block *sb,
+ unsigned long offset,
+ unsigned int trans_id)
+ {
+ struct reiserfs_journal_header *jh;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+ if (reiserfs_is_journal_aborted(journal))
+ return -EIO;
+@@ -1289,7 +1289,7 @@ static int _update_journal_header_block(
+ wait_on_buffer((journal->j_header_bh));
+ if (unlikely(!buffer_uptodate(journal->j_header_bh))) {
+ #ifdef CONFIG_REISERFS_CHECK
+- reiserfs_warning(p_s_sb, "journal-699",
++ reiserfs_warning(sb, "journal-699",
+ "buffer write failed");
+ #endif
+ return -EIO;
+@@ -1303,24 +1303,24 @@ static int _update_journal_header_block(
+ jh->j_first_unflushed_offset = cpu_to_le32(offset);
+ jh->j_mount_id = cpu_to_le32(journal->j_mount_id);
+
+- if (reiserfs_barrier_flush(p_s_sb)) {
++ if (reiserfs_barrier_flush(sb)) {
+ int ret;
+ lock_buffer(journal->j_header_bh);
+ ret = submit_barrier_buffer(journal->j_header_bh);
+ if (ret == -EOPNOTSUPP) {
+ set_buffer_uptodate(journal->j_header_bh);
+- disable_barrier(p_s_sb);
++ disable_barrier(sb);
+ goto sync;
+ }
+ wait_on_buffer(journal->j_header_bh);
+- check_barrier_completion(p_s_sb, journal->j_header_bh);
++ check_barrier_completion(sb, journal->j_header_bh);
+ } else {
+ sync:
+ set_buffer_dirty(journal->j_header_bh);
+ sync_dirty_buffer(journal->j_header_bh);
+ }
+ if (!buffer_uptodate(journal->j_header_bh)) {
+- reiserfs_warning(p_s_sb, "journal-837",
++ reiserfs_warning(sb, "journal-837",
+ "IO error during journal replay");
+ return -EIO;
+ }
+@@ -1328,23 +1328,23 @@ static int _update_journal_header_block(
+ return 0;
+ }
+
+-static int update_journal_header_block(struct super_block *p_s_sb,
++static int update_journal_header_block(struct super_block *sb,
+ unsigned long offset,
+ unsigned int trans_id)
+ {
+- return _update_journal_header_block(p_s_sb, offset, trans_id);
++ return _update_journal_header_block(sb, offset, trans_id);
+ }
+
+ /*
+ ** flush any and all journal lists older than you are
+ ** can only be called from flush_journal_list
+ */
+-static int flush_older_journal_lists(struct super_block *p_s_sb,
++static int flush_older_journal_lists(struct super_block *sb,
+ struct reiserfs_journal_list *jl)
+ {
+ struct list_head *entry;
+ struct reiserfs_journal_list *other_jl;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ unsigned int trans_id = jl->j_trans_id;
+
+ /* we know we are the only ones flushing things, no extra race
+@@ -1359,7 +1359,7 @@ static int flush_older_journal_lists(str
+ if (other_jl->j_trans_id < trans_id) {
+ BUG_ON(other_jl->j_refcount <= 0);
+ /* do not flush all */
+- flush_journal_list(p_s_sb, other_jl, 0);
++ flush_journal_list(sb, other_jl, 0);
+
+ /* other_jl is now deleted from the list */
+ goto restart;
+@@ -1908,22 +1908,22 @@ void remove_journal_hash(struct super_bl
+ }
+ }
+
+-static void free_journal_ram(struct super_block *p_s_sb)
++static void free_journal_ram(struct super_block *sb)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ kfree(journal->j_current_jl);
+ journal->j_num_lists--;
+
+ 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 */
++ free_list_bitmaps(sb, journal->j_list_bitmap);
++ free_bitmap_nodes(sb); /* must be after free_list_bitmaps */
+ 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, journal);
++ release_journal_dev(sb, journal);
+ vfree(journal);
+ }
+
+@@ -1932,27 +1932,27 @@ static void free_journal_ram(struct supe
+ ** of read_super() yet. Any other caller must keep error at 0.
+ */
+ static int do_journal_release(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, int error)
++ struct super_block *sb, int error)
+ {
+ struct reiserfs_transaction_handle myth;
+ int flushed = 0;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+ /* we only want to flush out transactions if we were called with error == 0
+ */
+- if (!error && !(p_s_sb->s_flags & MS_RDONLY)) {
++ if (!error && !(sb->s_flags & MS_RDONLY)) {
+ /* end the current trans */
+ BUG_ON(!th->t_trans_id);
+- do_journal_end(th, p_s_sb, 10, FLUSH_ALL);
++ do_journal_end(th, sb, 10, FLUSH_ALL);
+
+ /* make sure something gets logged to force our way into the flush code */
+- if (!journal_join(&myth, p_s_sb, 1)) {
+- reiserfs_prepare_for_journal(p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb),
++ if (!journal_join(&myth, sb, 1)) {
++ reiserfs_prepare_for_journal(sb,
++ SB_BUFFER_WITH_SB(sb),
+ 1);
+- journal_mark_dirty(&myth, p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb));
+- do_journal_end(&myth, p_s_sb, 1, FLUSH_ALL);
++ journal_mark_dirty(&myth, sb,
++ SB_BUFFER_WITH_SB(sb));
++ do_journal_end(&myth, sb, 1, FLUSH_ALL);
+ flushed = 1;
+ }
+ }
+@@ -1960,26 +1960,26 @@ static int do_journal_release(struct rei
+ /* this also catches errors during the do_journal_end above */
+ if (!error && reiserfs_is_journal_aborted(journal)) {
+ memset(&myth, 0, sizeof(myth));
+- if (!journal_join_abort(&myth, p_s_sb, 1)) {
+- reiserfs_prepare_for_journal(p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb),
++ if (!journal_join_abort(&myth, sb, 1)) {
++ reiserfs_prepare_for_journal(sb,
++ SB_BUFFER_WITH_SB(sb),
+ 1);
+- journal_mark_dirty(&myth, p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb));
+- do_journal_end(&myth, p_s_sb, 1, FLUSH_ALL);
++ journal_mark_dirty(&myth, sb,
++ SB_BUFFER_WITH_SB(sb));
++ do_journal_end(&myth, sb, 1, FLUSH_ALL);
+ }
+ }
+
+ reiserfs_mounted_fs_count--;
+ /* wait for all commits to finish */
+- cancel_delayed_work(&SB_JOURNAL(p_s_sb)->j_work);
++ cancel_delayed_work(&SB_JOURNAL(sb)->j_work);
+ flush_workqueue(commit_wq);
+ if (!reiserfs_mounted_fs_count) {
+ destroy_workqueue(commit_wq);
+ commit_wq = NULL;
+ }
+
+- free_journal_ram(p_s_sb);
++ free_journal_ram(sb);
+
+ return 0;
+ }
+@@ -1988,28 +1988,28 @@ static int do_journal_release(struct rei
+ ** call on unmount. flush all journal trans, release all alloc'd ram
+ */
+ int journal_release(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb)
++ struct super_block *sb)
+ {
+- return do_journal_release(th, p_s_sb, 0);
++ return do_journal_release(th, sb, 0);
+ }
+
+ /*
+ ** only call from an error condition inside reiserfs_read_super!
+ */
+ int journal_release_error(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb)
++ struct super_block *sb)
+ {
+- return do_journal_release(th, p_s_sb, 1);
++ return do_journal_release(th, sb, 1);
+ }
+
+ /* compares description block with commit block. returns 1 if they differ, 0 if they are the same */
+-static int journal_compare_desc_commit(struct super_block *p_s_sb,
++static int journal_compare_desc_commit(struct super_block *sb,
+ struct reiserfs_journal_desc *desc,
+ 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(p_s_sb)->j_trans_max ||
++ get_commit_trans_len(commit) > SB_JOURNAL(sb)->j_trans_max ||
+ get_commit_trans_len(commit) <= 0) {
+ return 1;
+ }
+@@ -2020,7 +2020,7 @@ static int journal_compare_desc_commit(s
+ ** returns -1 if it found a corrupt commit block
+ ** returns 1 if both desc and commit were valid
+ */
+-static int journal_transaction_is_valid(struct super_block *p_s_sb,
++static int journal_transaction_is_valid(struct super_block *sb,
+ struct buffer_head *d_bh,
+ unsigned int *oldest_invalid_trans_id,
+ unsigned long *newest_mount_id)
+@@ -2038,7 +2038,7 @@ static int journal_transaction_is_valid(
+ && !memcmp(get_journal_desc_magic(d_bh), JOURNAL_DESC_MAGIC, 8)) {
+ if (oldest_invalid_trans_id && *oldest_invalid_trans_id
+ && get_desc_trans_id(desc) > *oldest_invalid_trans_id) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-986: transaction "
+ "is valid returning because trans_id %d is greater than "
+ "oldest_invalid %lu",
+@@ -2048,7 +2048,7 @@ static int journal_transaction_is_valid(
+ }
+ if (newest_mount_id
+ && *newest_mount_id > get_desc_mount_id(desc)) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1087: transaction "
+ "is valid returning because mount_id %d is less than "
+ "newest_mount_id %lu",
+@@ -2056,37 +2056,37 @@ static int journal_transaction_is_valid(
+ *newest_mount_id);
+ return -1;
+ }
+- if (get_desc_trans_len(desc) > SB_JOURNAL(p_s_sb)->j_trans_max) {
+- reiserfs_warning(p_s_sb, "journal-2018",
++ if (get_desc_trans_len(desc) > SB_JOURNAL(sb)->j_trans_max) {
++ reiserfs_warning(sb, "journal-2018",
+ "Bad transaction length %d "
+ "encountered, ignoring transaction",
+ get_desc_trans_len(desc));
+ return -1;
+ }
+- offset = d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
++ offset = d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb);
+
+ /* ok, we have a journal description block, lets see if the transaction was valid */
+ c_bh =
+- journal_bread(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ journal_bread(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ ((offset + get_desc_trans_len(desc) +
+- 1) % SB_ONDISK_JOURNAL_SIZE(p_s_sb)));
++ 1) % SB_ONDISK_JOURNAL_SIZE(sb)));
+ if (!c_bh)
+ return 0;
+ commit = (struct reiserfs_journal_commit *)c_bh->b_data;
+- if (journal_compare_desc_commit(p_s_sb, desc, commit)) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ if (journal_compare_desc_commit(sb, desc, commit)) {
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal_transaction_is_valid, commit offset %ld had bad "
+ "time %d or length %d",
+ c_bh->b_blocknr -
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ get_commit_trans_id(commit),
+ get_commit_trans_len(commit));
+ brelse(c_bh);
+ if (oldest_invalid_trans_id) {
+ *oldest_invalid_trans_id =
+ get_desc_trans_id(desc);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1004: "
+ "transaction_is_valid setting oldest invalid trans_id "
+ "to %d",
+@@ -2095,11 +2095,11 @@ static int journal_transaction_is_valid(
+ return -1;
+ }
+ brelse(c_bh);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1006: found valid "
+ "transaction start offset %llu, len %d id %d",
+ d_bh->b_blocknr -
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ get_desc_trans_len(desc),
+ get_desc_trans_id(desc));
+ return 1;
+@@ -2121,13 +2121,13 @@ static void brelse_array(struct buffer_h
+ ** this either reads in a replays a transaction, or returns because the transaction
+ ** is invalid, or too old.
+ */
+-static int journal_read_transaction(struct super_block *p_s_sb,
++static int journal_read_transaction(struct super_block *sb,
+ unsigned long cur_dblock,
+ unsigned long oldest_start,
+ unsigned int oldest_trans_id,
+ unsigned long newest_mount_id)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_desc *desc;
+ struct reiserfs_journal_commit *commit;
+ unsigned int trans_id = 0;
+@@ -2139,45 +2139,45 @@ static int journal_read_transaction(stru
+ int i;
+ int trans_half;
+
+- d_bh = journal_bread(p_s_sb, cur_dblock);
++ d_bh = journal_bread(sb, cur_dblock);
+ if (!d_bh)
+ return 1;
+ desc = (struct reiserfs_journal_desc *)d_bh->b_data;
+- trans_offset = d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1037: "
++ trans_offset = d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb);
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1037: "
+ "journal_read_transaction, offset %llu, len %d mount_id %d",
+- d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ d_bh->b_blocknr - SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ get_desc_trans_len(desc), get_desc_mount_id(desc));
+ if (get_desc_trans_id(desc) < oldest_trans_id) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1039: "
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1039: "
+ "journal_read_trans skipping because %lu is too old",
+ cur_dblock -
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb));
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb));
+ brelse(d_bh);
+ return 1;
+ }
+ if (get_desc_mount_id(desc) != newest_mount_id) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1146: "
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1146: "
+ "journal_read_trans skipping because %d is != "
+ "newest_mount_id %lu", get_desc_mount_id(desc),
+ newest_mount_id);
+ brelse(d_bh);
+ return 1;
+ }
+- c_bh = journal_bread(p_s_sb, SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ c_bh = journal_bread(sb, SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ ((trans_offset + get_desc_trans_len(desc) + 1) %
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)));
++ SB_ONDISK_JOURNAL_SIZE(sb)));
+ if (!c_bh) {
+ brelse(d_bh);
+ return 1;
+ }
+ commit = (struct reiserfs_journal_commit *)c_bh->b_data;
+- if (journal_compare_desc_commit(p_s_sb, desc, commit)) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ if (journal_compare_desc_commit(sb, desc, commit)) {
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal_read_transaction, "
+ "commit offset %llu had bad time %d or length %d",
+ c_bh->b_blocknr -
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ get_commit_trans_id(commit),
+ get_commit_trans_len(commit));
+ brelse(c_bh);
+@@ -2195,30 +2195,30 @@ static int journal_read_transaction(stru
+ brelse(d_bh);
+ kfree(log_blocks);
+ kfree(real_blocks);
+- reiserfs_warning(p_s_sb, "journal-1169",
++ reiserfs_warning(sb, "journal-1169",
+ "kmalloc failed, unable to mount FS");
+ return -1;
+ }
+ /* get all the buffer heads */
+- trans_half = journal_trans_half(p_s_sb->s_blocksize);
++ trans_half = journal_trans_half(sb->s_blocksize);
+ for (i = 0; i < get_desc_trans_len(desc); i++) {
+ log_blocks[i] =
+- journal_getblk(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ journal_getblk(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ (trans_offset + 1 +
+- i) % SB_ONDISK_JOURNAL_SIZE(p_s_sb));
++ i) % SB_ONDISK_JOURNAL_SIZE(sb));
+ if (i < trans_half) {
+ real_blocks[i] =
+- sb_getblk(p_s_sb,
++ sb_getblk(sb,
+ le32_to_cpu(desc->j_realblock[i]));
+ } else {
+ real_blocks[i] =
+- sb_getblk(p_s_sb,
++ sb_getblk(sb,
+ le32_to_cpu(commit->
+ j_realblock[i - trans_half]));
+ }
+- if (real_blocks[i]->b_blocknr > SB_BLOCK_COUNT(p_s_sb)) {
+- reiserfs_warning(p_s_sb, "journal-1207",
++ if (real_blocks[i]->b_blocknr > SB_BLOCK_COUNT(sb)) {
++ reiserfs_warning(sb, "journal-1207",
+ "REPLAY FAILURE fsck required! "
+ "Block to replay is outside of "
+ "filesystem");
+@@ -2226,8 +2226,8 @@ static int journal_read_transaction(stru
+ }
+ /* make sure we don't try to replay onto log or reserved area */
+ if (is_block_in_log_or_reserved_area
+- (p_s_sb, real_blocks[i]->b_blocknr)) {
+- reiserfs_warning(p_s_sb, "journal-1204",
++ (sb, real_blocks[i]->b_blocknr)) {
++ reiserfs_warning(sb, "journal-1204",
+ "REPLAY FAILURE fsck required! "
+ "Trying to replay onto a log block");
+ abort_replay:
+@@ -2245,7 +2245,7 @@ static int journal_read_transaction(stru
+ for (i = 0; i < get_desc_trans_len(desc); i++) {
+ wait_on_buffer(log_blocks[i]);
+ if (!buffer_uptodate(log_blocks[i])) {
+- reiserfs_warning(p_s_sb, "journal-1212",
++ reiserfs_warning(sb, "journal-1212",
+ "REPLAY FAILURE fsck required! "
+ "buffer write failed");
+ brelse_array(log_blocks + i,
+@@ -2270,7 +2270,7 @@ static int journal_read_transaction(stru
+ for (i = 0; i < get_desc_trans_len(desc); i++) {
+ wait_on_buffer(real_blocks[i]);
+ if (!buffer_uptodate(real_blocks[i])) {
+- reiserfs_warning(p_s_sb, "journal-1226",
++ reiserfs_warning(sb, "journal-1226",
+ "REPLAY FAILURE, fsck required! "
+ "buffer write failed");
+ brelse_array(real_blocks + i,
+@@ -2284,15 +2284,15 @@ static int journal_read_transaction(stru
+ brelse(real_blocks[i]);
+ }
+ cur_dblock =
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ ((trans_offset + get_desc_trans_len(desc) +
+- 2) % SB_ONDISK_JOURNAL_SIZE(p_s_sb));
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ 2) % SB_ONDISK_JOURNAL_SIZE(sb));
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1095: setting journal " "start to offset %ld",
+- cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb));
++ cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb));
+
+ /* init starting values for the first transaction, in case this is the last transaction to be replayed. */
+- journal->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
++ journal->j_start = cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb);
+ journal->j_last_flush_trans_id = trans_id;
+ journal->j_trans_id = trans_id + 1;
+ /* check for trans_id overflow */
+@@ -2357,9 +2357,9 @@ static struct buffer_head *reiserfs_brea
+ **
+ ** On exit, it sets things up so the first transaction will work correctly.
+ */
+-static int journal_read(struct super_block *p_s_sb)
++static int journal_read(struct super_block *sb)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_desc *desc;
+ unsigned int oldest_trans_id = 0;
+ unsigned int oldest_invalid_trans_id = 0;
+@@ -2375,8 +2375,8 @@ static int journal_read(struct super_blo
+ int ret;
+ char b[BDEVNAME_SIZE];
+
+- cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb);
+- reiserfs_info(p_s_sb, "checking transaction log (%s)\n",
++ cur_dblock = SB_ONDISK_JOURNAL_1st_BLOCK(sb);
++ reiserfs_info(sb, "checking transaction log (%s)\n",
+ bdevname(journal->j_dev_bd, b));
+ start = get_seconds();
+
+@@ -2384,22 +2384,22 @@ static int journal_read(struct super_blo
+ ** is the first unflushed, and if that transaction is not valid,
+ ** replay is done
+ */
+- journal->j_header_bh = journal_bread(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb)
+- + SB_ONDISK_JOURNAL_SIZE(p_s_sb));
++ journal->j_header_bh = journal_bread(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb)
++ + SB_ONDISK_JOURNAL_SIZE(sb));
+ if (!journal->j_header_bh) {
+ return 1;
+ }
+ jh = (struct reiserfs_journal_header *)(journal->j_header_bh->b_data);
+ if (le32_to_cpu(jh->j_first_unflushed_offset) <
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)
++ SB_ONDISK_JOURNAL_SIZE(sb)
+ && le32_to_cpu(jh->j_last_flush_trans_id) > 0) {
+ oldest_start =
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ le32_to_cpu(jh->j_first_unflushed_offset);
+ oldest_trans_id = le32_to_cpu(jh->j_last_flush_trans_id) + 1;
+ newest_mount_id = le32_to_cpu(jh->j_mount_id);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1153: found in "
+ "header: first_unflushed_offset %d, last_flushed_trans_id "
+ "%lu", le32_to_cpu(jh->j_first_unflushed_offset),
+@@ -2411,10 +2411,10 @@ static int journal_read(struct super_blo
+ ** through the whole log.
+ */
+ d_bh =
+- journal_bread(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ journal_bread(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ le32_to_cpu(jh->j_first_unflushed_offset));
+- ret = journal_transaction_is_valid(p_s_sb, d_bh, NULL, NULL);
++ ret = journal_transaction_is_valid(sb, d_bh, NULL, NULL);
+ if (!ret) {
+ continue_replay = 0;
+ }
+@@ -2422,8 +2422,8 @@ static int journal_read(struct super_blo
+ goto start_log_replay;
+ }
+
+- if (continue_replay && bdev_read_only(p_s_sb->s_bdev)) {
+- reiserfs_warning(p_s_sb, "clm-2076",
++ if (continue_replay && bdev_read_only(sb->s_bdev)) {
++ reiserfs_warning(sb, "clm-2076",
+ "device is readonly, unable to replay log");
+ return -1;
+ }
+@@ -2433,17 +2433,17 @@ static int journal_read(struct super_blo
+ */
+ while (continue_replay
+ && cur_dblock <
+- (SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb))) {
++ (SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
++ SB_ONDISK_JOURNAL_SIZE(sb))) {
+ /* Note that it is required for blocksize of primary fs device and journal
+ device to be the same */
+ 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));
++ sb->s_blocksize,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
++ SB_ONDISK_JOURNAL_SIZE(sb));
+ ret =
+- journal_transaction_is_valid(p_s_sb, d_bh,
++ journal_transaction_is_valid(sb, d_bh,
+ &oldest_invalid_trans_id,
+ &newest_mount_id);
+ if (ret == 1) {
+@@ -2452,26 +2452,26 @@ static int journal_read(struct super_blo
+ oldest_trans_id = get_desc_trans_id(desc);
+ oldest_start = d_bh->b_blocknr;
+ newest_mount_id = get_desc_mount_id(desc);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1179: Setting "
+ "oldest_start to offset %llu, trans_id %lu",
+ oldest_start -
+ SB_ONDISK_JOURNAL_1st_BLOCK
+- (p_s_sb), oldest_trans_id);
++ (sb), oldest_trans_id);
+ } else if (oldest_trans_id > get_desc_trans_id(desc)) {
+ /* one we just read was older */
+ oldest_trans_id = get_desc_trans_id(desc);
+ oldest_start = d_bh->b_blocknr;
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1180: Resetting "
+ "oldest_start to offset %lu, trans_id %lu",
+ oldest_start -
+ SB_ONDISK_JOURNAL_1st_BLOCK
+- (p_s_sb), oldest_trans_id);
++ (sb), oldest_trans_id);
+ }
+ if (newest_mount_id < get_desc_mount_id(desc)) {
+ newest_mount_id = get_desc_mount_id(desc);
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1299: Setting "
+ "newest_mount_id to %d",
+ get_desc_mount_id(desc));
+@@ -2486,17 +2486,17 @@ static int journal_read(struct super_blo
+ start_log_replay:
+ cur_dblock = oldest_start;
+ if (oldest_trans_id) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1206: Starting replay "
+ "from offset %llu, trans_id %lu",
+- cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ cur_dblock - SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ oldest_trans_id);
+
+ }
+ replay_count = 0;
+ while (continue_replay && oldest_trans_id > 0) {
+ ret =
+- journal_read_transaction(p_s_sb, cur_dblock, oldest_start,
++ journal_read_transaction(sb, cur_dblock, oldest_start,
+ oldest_trans_id, newest_mount_id);
+ if (ret < 0) {
+ return ret;
+@@ -2504,14 +2504,14 @@ static int journal_read(struct super_blo
+ break;
+ }
+ cur_dblock =
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + journal->j_start;
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) + journal->j_start;
+ replay_count++;
+ if (cur_dblock == oldest_start)
+ break;
+ }
+
+ if (oldest_trans_id == 0) {
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "journal-1225: No valid " "transactions found");
+ }
+ /* j_start does not get set correctly if we don't replay any transactions.
+@@ -2531,16 +2531,16 @@ static int journal_read(struct super_blo
+ } else {
+ journal->j_mount_id = newest_mount_id + 1;
+ }
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE, "journal-1299: Setting "
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE, "journal-1299: Setting "
+ "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,
++ reiserfs_info(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, journal->j_start,
++ if (!bdev_read_only(sb->s_bdev) &&
++ _update_journal_header_block(sb, journal->j_start,
+ journal->j_last_flush_trans_id)) {
+ /* replay failed, caller must call free_journal_ram and abort
+ ** the mount
+@@ -2565,9 +2565,9 @@ static struct reiserfs_journal_list *all
+ return jl;
+ }
+
+-static void journal_list_init(struct super_block *p_s_sb)
++static void journal_list_init(struct super_block *sb)
+ {
+- SB_JOURNAL(p_s_sb)->j_current_jl = alloc_journal_list(p_s_sb);
++ SB_JOURNAL(sb)->j_current_jl = alloc_journal_list(sb);
+ }
+
+ static int release_journal_dev(struct super_block *super,
+@@ -2663,28 +2663,28 @@ static int journal_init_dev(struct super
+ */
+ #define REISERFS_STANDARD_BLKSIZE (4096)
+
+-static int check_advise_trans_params(struct super_block *p_s_sb,
++static int check_advise_trans_params(struct super_block *sb,
+ struct reiserfs_journal *journal)
+ {
+ if (journal->j_trans_max) {
+ /* Non-default journal params.
+ Do sanity check for them. */
+ int ratio = 1;
+- if (p_s_sb->s_blocksize < REISERFS_STANDARD_BLKSIZE)
+- ratio = REISERFS_STANDARD_BLKSIZE / p_s_sb->s_blocksize;
++ if (sb->s_blocksize < REISERFS_STANDARD_BLKSIZE)
++ ratio = REISERFS_STANDARD_BLKSIZE / sb->s_blocksize;
+
+ if (journal->j_trans_max > JOURNAL_TRANS_MAX_DEFAULT / ratio ||
+ journal->j_trans_max < JOURNAL_TRANS_MIN_DEFAULT / ratio ||
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb) / journal->j_trans_max <
++ SB_ONDISK_JOURNAL_SIZE(sb) / journal->j_trans_max <
+ JOURNAL_MIN_RATIO) {
+- reiserfs_warning(p_s_sb, "sh-462",
++ reiserfs_warning(sb, "sh-462",
+ "bad transaction max size (%u). "
+ "FSCK?", journal->j_trans_max);
+ return 1;
+ }
+ if (journal->j_max_batch != (journal->j_trans_max) *
+ JOURNAL_MAX_BATCH_DEFAULT/JOURNAL_TRANS_MAX_DEFAULT) {
+- reiserfs_warning(p_s_sb, "sh-463",
++ reiserfs_warning(sb, "sh-463",
+ "bad transaction max batch (%u). "
+ "FSCK?", journal->j_max_batch);
+ return 1;
+@@ -2694,9 +2694,9 @@ static int check_advise_trans_params(str
+ The file system was created by old version
+ of mkreiserfs, so some fields contain zeros,
+ and we need to advise proper values for them */
+- if (p_s_sb->s_blocksize != REISERFS_STANDARD_BLKSIZE) {
+- reiserfs_warning(p_s_sb, "sh-464", "bad blocksize (%u)",
+- p_s_sb->s_blocksize);
++ if (sb->s_blocksize != REISERFS_STANDARD_BLKSIZE) {
++ reiserfs_warning(sb, "sh-464", "bad blocksize (%u)",
++ sb->s_blocksize);
+ return 1;
+ }
+ journal->j_trans_max = JOURNAL_TRANS_MAX_DEFAULT;
+@@ -2709,10 +2709,10 @@ static int check_advise_trans_params(str
+ /*
+ ** must be called once on fs mount. calls journal_read for you
+ */
+-int journal_init(struct super_block *p_s_sb, const char *j_dev_name,
++int journal_init(struct super_block *sb, const char *j_dev_name,
+ int old_format, unsigned int commit_max_age)
+ {
+- int num_cnodes = SB_ONDISK_JOURNAL_SIZE(p_s_sb) * 2;
++ int num_cnodes = SB_ONDISK_JOURNAL_SIZE(sb) * 2;
+ struct buffer_head *bhjh;
+ struct reiserfs_super_block *rs;
+ struct reiserfs_journal_header *jh;
+@@ -2720,9 +2720,9 @@ int journal_init(struct super_block *p_s
+ struct reiserfs_journal_list *jl;
+ char b[BDEVNAME_SIZE];
+
+- journal = SB_JOURNAL(p_s_sb) = vmalloc(sizeof(struct reiserfs_journal));
++ journal = SB_JOURNAL(sb) = vmalloc(sizeof(struct reiserfs_journal));
+ if (!journal) {
+- reiserfs_warning(p_s_sb, "journal-1256",
++ reiserfs_warning(sb, "journal-1256",
+ "unable to get memory for journal structure");
+ return 1;
+ }
+@@ -2732,50 +2732,50 @@ int journal_init(struct super_block *p_s
+ INIT_LIST_HEAD(&journal->j_working_list);
+ INIT_LIST_HEAD(&journal->j_journal_list);
+ journal->j_persistent_trans = 0;
+- if (reiserfs_allocate_list_bitmaps(p_s_sb,
++ if (reiserfs_allocate_list_bitmaps(sb,
+ journal->j_list_bitmap,
+- reiserfs_bmap_count(p_s_sb)))
++ reiserfs_bmap_count(sb)))
+ goto free_and_return;
+- allocate_bitmap_nodes(p_s_sb);
++ allocate_bitmap_nodes(sb);
+
+ /* reserved for journal area support */
+- SB_JOURNAL_1st_RESERVED_BLOCK(p_s_sb) = (old_format ?
++ SB_JOURNAL_1st_RESERVED_BLOCK(sb) = (old_format ?
+ REISERFS_OLD_DISK_OFFSET_IN_BYTES
+- / p_s_sb->s_blocksize +
+- reiserfs_bmap_count(p_s_sb) +
++ / sb->s_blocksize +
++ reiserfs_bmap_count(sb) +
+ 1 :
+ REISERFS_DISK_OFFSET_IN_BYTES /
+- p_s_sb->s_blocksize + 2);
++ sb->s_blocksize + 2);
+
+ /* Sanity check to see is the standard journal fitting withing first bitmap
+ (actual for small blocksizes) */
+- if (!SB_ONDISK_JOURNAL_DEVICE(p_s_sb) &&
+- (SB_JOURNAL_1st_RESERVED_BLOCK(p_s_sb) +
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb) > p_s_sb->s_blocksize * 8)) {
+- reiserfs_warning(p_s_sb, "journal-1393",
++ if (!SB_ONDISK_JOURNAL_DEVICE(sb) &&
++ (SB_JOURNAL_1st_RESERVED_BLOCK(sb) +
++ SB_ONDISK_JOURNAL_SIZE(sb) > sb->s_blocksize * 8)) {
++ reiserfs_warning(sb, "journal-1393",
+ "journal does not fit for area addressed "
+ "by first of bitmap blocks. It starts at "
+ "%u and its size is %u. Block size %ld",
+- SB_JOURNAL_1st_RESERVED_BLOCK(p_s_sb),
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb),
+- p_s_sb->s_blocksize);
++ SB_JOURNAL_1st_RESERVED_BLOCK(sb),
++ SB_ONDISK_JOURNAL_SIZE(sb),
++ sb->s_blocksize);
+ goto free_and_return;
+ }
+
+- if (journal_init_dev(p_s_sb, journal, j_dev_name) != 0) {
+- reiserfs_warning(p_s_sb, "sh-462",
++ if (journal_init_dev(sb, journal, j_dev_name) != 0) {
++ reiserfs_warning(sb, "sh-462",
+ "unable to initialize jornal device");
+ goto free_and_return;
+ }
+
+- rs = SB_DISK_SUPER_BLOCK(p_s_sb);
++ rs = SB_DISK_SUPER_BLOCK(sb);
+
+ /* read journal header */
+- bhjh = journal_bread(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb));
++ bhjh = journal_bread(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
++ SB_ONDISK_JOURNAL_SIZE(sb));
+ if (!bhjh) {
+- reiserfs_warning(p_s_sb, "sh-459",
++ reiserfs_warning(sb, "sh-459",
+ "unable to read journal header");
+ goto free_and_return;
+ }
+@@ -2785,7 +2785,7 @@ int journal_init(struct super_block *p_s
+ if (is_reiserfs_jr(rs)
+ && (le32_to_cpu(jh->jh_journal.jp_journal_magic) !=
+ sb_jp_journal_magic(rs))) {
+- reiserfs_warning(p_s_sb, "sh-460",
++ reiserfs_warning(sb, "sh-460",
+ "journal header magic %x (device %s) does "
+ "not match to magic found in super block %x",
+ jh->jh_journal.jp_journal_magic,
+@@ -2801,7 +2801,7 @@ int journal_init(struct super_block *p_s
+ le32_to_cpu(jh->jh_journal.jp_journal_max_commit_age);
+ journal->j_max_trans_age = JOURNAL_MAX_TRANS_AGE;
+
+- if (check_advise_trans_params(p_s_sb, journal) != 0)
++ if (check_advise_trans_params(sb, journal) != 0)
+ goto free_and_return;
+ journal->j_default_max_commit_age = journal->j_max_commit_age;
+
+@@ -2810,12 +2810,12 @@ int journal_init(struct super_block *p_s
+ journal->j_max_trans_age = commit_max_age;
+ }
+
+- reiserfs_info(p_s_sb, "journal params: device %s, size %u, "
++ reiserfs_info(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(journal->j_dev_bd, b),
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb),
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
++ SB_ONDISK_JOURNAL_SIZE(sb),
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb),
+ journal->j_trans_max,
+ journal->j_max_batch,
+ journal->j_max_commit_age, journal->j_max_trans_age);
+@@ -2823,7 +2823,7 @@ int journal_init(struct super_block *p_s
+ brelse(bhjh);
+
+ journal->j_list_bitmap_index = 0;
+- journal_list_init(p_s_sb);
++ journal_list_init(sb);
+
+ memset(journal->j_list_hash_table, 0,
+ JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *));
+@@ -2855,7 +2855,7 @@ int journal_init(struct super_block *p_s
+ journal->j_must_wait = 0;
+
+ if (journal->j_cnode_free == 0) {
+- reiserfs_warning(p_s_sb, "journal-2004", "Journal cnode memory "
++ reiserfs_warning(sb, "journal-2004", "Journal cnode memory "
+ "allocation failed (%ld bytes). Journal is "
+ "too large for available memory. Usually "
+ "this is due to a journal that is too large.",
+@@ -2863,16 +2863,16 @@ int journal_init(struct super_block *p_s
+ goto free_and_return;
+ }
+
+- init_journal_hash(p_s_sb);
++ init_journal_hash(sb);
+ jl = journal->j_current_jl;
+- jl->j_list_bitmap = get_list_bitmap(p_s_sb, jl);
++ jl->j_list_bitmap = get_list_bitmap(sb, jl);
+ if (!jl->j_list_bitmap) {
+- reiserfs_warning(p_s_sb, "journal-2005",
++ reiserfs_warning(sb, "journal-2005",
+ "get_list_bitmap failed for journal list 0");
+ goto free_and_return;
+ }
+- if (journal_read(p_s_sb) < 0) {
+- reiserfs_warning(p_s_sb, "reiserfs-2006",
++ if (journal_read(sb) < 0) {
++ reiserfs_warning(sb, "reiserfs-2006",
+ "Replay Failure, unable to mount");
+ goto free_and_return;
+ }
+@@ -2882,10 +2882,10 @@ int journal_init(struct super_block *p_s
+ commit_wq = create_workqueue("reiserfs");
+
+ INIT_DELAYED_WORK(&journal->j_work, flush_async_commits);
+- journal->j_work_sb = p_s_sb;
++ journal->j_work_sb = sb;
+ return 0;
+ free_and_return:
+- free_journal_ram(p_s_sb);
++ free_journal_ram(sb);
+ return 1;
+ }
+
+@@ -3001,37 +3001,37 @@ static void let_transaction_grow(struct
+ ** expect to use in nblocks.
+ */
+ static int do_journal_begin_r(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks,
++ struct super_block *sb, unsigned long nblocks,
+ int join)
+ {
+ time_t now = get_seconds();
+ unsigned int old_trans_id;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_transaction_handle myth;
+ int sched_count = 0;
+ int retval;
+
+- reiserfs_check_lock_depth(p_s_sb, "journal_begin");
++ reiserfs_check_lock_depth(sb, "journal_begin");
+ BUG_ON(nblocks > journal->j_trans_max);
+
+- PROC_INFO_INC(p_s_sb, journal.journal_being);
++ PROC_INFO_INC(sb, journal.journal_being);
+ /* set here for journal_join */
+ th->t_refcount = 1;
+- th->t_super = p_s_sb;
++ th->t_super = sb;
+
+ relock:
+- lock_journal(p_s_sb);
++ lock_journal(sb);
+ if (join != JBEGIN_ABORT && reiserfs_is_journal_aborted(journal)) {
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+ retval = journal->j_errno;
+ goto out_fail;
+ }
+ journal->j_bcount++;
+
+ if (test_bit(J_WRITERS_BLOCKED, &journal->j_state)) {
+- unlock_journal(p_s_sb);
+- reiserfs_wait_on_write_block(p_s_sb);
+- PROC_INFO_INC(p_s_sb, journal.journal_relock_writers);
++ unlock_journal(sb);
++ reiserfs_wait_on_write_block(sb);
++ PROC_INFO_INC(sb, journal.journal_relock_writers);
+ goto relock;
+ }
+ now = get_seconds();
+@@ -3052,7 +3052,7 @@ static int do_journal_begin_r(struct rei
+ || (!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 */
++ unlock_journal(sb); /* allow others to finish this transaction */
+
+ if (!join && (journal->j_len_alloc + nblocks + 2) >=
+ journal->j_max_batch &&
+@@ -3060,7 +3060,7 @@ static int do_journal_begin_r(struct rei
+ (journal->j_len_alloc * 75)) {
+ if (atomic_read(&journal->j_wcount) > 10) {
+ sched_count++;
+- queue_log_writer(p_s_sb);
++ queue_log_writer(sb);
+ goto relock;
+ }
+ }
+@@ -3070,25 +3070,25 @@ static int do_journal_begin_r(struct rei
+ if (atomic_read(&journal->j_jlock)) {
+ while (journal->j_trans_id == old_trans_id &&
+ atomic_read(&journal->j_jlock)) {
+- queue_log_writer(p_s_sb);
++ queue_log_writer(sb);
+ }
+ goto relock;
+ }
+- retval = journal_join(&myth, p_s_sb, 1);
++ retval = journal_join(&myth, sb, 1);
+ if (retval)
+ goto out_fail;
+
+ /* someone might have ended the transaction while we joined */
+ if (old_trans_id != journal->j_trans_id) {
+- retval = do_journal_end(&myth, p_s_sb, 1, 0);
++ retval = do_journal_end(&myth, sb, 1, 0);
+ } else {
+- retval = do_journal_end(&myth, p_s_sb, 1, COMMIT_NOW);
++ retval = do_journal_end(&myth, sb, 1, COMMIT_NOW);
+ }
+
+ if (retval)
+ goto out_fail;
+
+- PROC_INFO_INC(p_s_sb, journal.journal_relock_wcount);
++ PROC_INFO_INC(sb, journal.journal_relock_wcount);
+ goto relock;
+ }
+ /* we are the first writer, set trans_id */
+@@ -3100,7 +3100,7 @@ static int do_journal_begin_r(struct rei
+ th->t_blocks_logged = 0;
+ th->t_blocks_allocated = nblocks;
+ th->t_trans_id = journal->j_trans_id;
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+ INIT_LIST_HEAD(&th->t_list);
+ get_fs_excl();
+ return 0;
+@@ -3110,7 +3110,7 @@ static int do_journal_begin_r(struct rei
+ /* Re-set th->t_super, so we can properly keep track of how many
+ * persistent transactions there are. We need to do this so if this
+ * call is part of a failed restart_transaction, we can free it later */
+- th->t_super = p_s_sb;
++ th->t_super = sb;
+ return retval;
+ }
+
+@@ -3161,7 +3161,7 @@ int reiserfs_end_persistent_transaction(
+ }
+
+ static int journal_join(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks)
++ struct super_block *sb, unsigned long nblocks)
+ {
+ struct reiserfs_transaction_handle *cur_th = current->journal_info;
+
+@@ -3170,11 +3170,11 @@ static int journal_join(struct reiserfs_
+ */
+ th->t_handle_save = cur_th;
+ BUG_ON(cur_th && cur_th->t_refcount > 1);
+- return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_JOIN);
++ return do_journal_begin_r(th, sb, nblocks, JBEGIN_JOIN);
+ }
+
+ int journal_join_abort(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks)
++ struct super_block *sb, unsigned long nblocks)
+ {
+ struct reiserfs_transaction_handle *cur_th = current->journal_info;
+
+@@ -3183,11 +3183,11 @@ int journal_join_abort(struct reiserfs_t
+ */
+ th->t_handle_save = cur_th;
+ BUG_ON(cur_th && cur_th->t_refcount > 1);
+- return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_ABORT);
++ return do_journal_begin_r(th, sb, nblocks, JBEGIN_ABORT);
+ }
+
+ int journal_begin(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks)
++ struct super_block *sb, unsigned long nblocks)
+ {
+ struct reiserfs_transaction_handle *cur_th = current->journal_info;
+ int ret;
+@@ -3195,12 +3195,12 @@ int journal_begin(struct reiserfs_transa
+ th->t_handle_save = NULL;
+ if (cur_th) {
+ /* we are nesting into the current transaction */
+- if (cur_th->t_super == p_s_sb) {
++ if (cur_th->t_super == sb) {
+ BUG_ON(!cur_th->t_refcount);
+ cur_th->t_refcount++;
+ memcpy(th, cur_th, sizeof(*th));
+ if (th->t_refcount <= 1)
+- reiserfs_warning(p_s_sb, "reiserfs-2005",
++ reiserfs_warning(sb, "reiserfs-2005",
+ "BAD: refcount <= 1, but "
+ "journal_info != 0");
+ return 0;
+@@ -3209,7 +3209,7 @@ int journal_begin(struct reiserfs_transa
+ ** save it and restore on journal_end. This should never
+ ** really happen...
+ */
+- reiserfs_warning(p_s_sb, "clm-2100",
++ reiserfs_warning(sb, "clm-2100",
+ "nesting info a different FS");
+ th->t_handle_save = current->journal_info;
+ current->journal_info = th;
+@@ -3217,7 +3217,7 @@ int journal_begin(struct reiserfs_transa
+ } else {
+ current->journal_info = th;
+ }
+- ret = do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_REG);
++ ret = do_journal_begin_r(th, sb, nblocks, JBEGIN_REG);
+ BUG_ON(current->journal_info != th);
+
+ /* I guess this boils down to being the reciprocal of clm-2100 above.
+@@ -3241,28 +3241,28 @@ int journal_begin(struct reiserfs_transa
+ ** 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 super_block *sb, struct buffer_head *bh)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_cnode *cn = NULL;
+ int count_already_incd = 0;
+ int prepared = 0;
+ BUG_ON(!th->t_trans_id);
+
+- PROC_INFO_INC(p_s_sb, journal.mark_dirty);
++ PROC_INFO_INC(sb, journal.mark_dirty);
+ if (th->t_trans_id != journal->j_trans_id) {
+ reiserfs_panic(th->t_super, "journal-1577",
+ "handle trans id %ld != current trans id %ld",
+ th->t_trans_id, journal->j_trans_id);
+ }
+
+- p_s_sb->s_dirt = 1;
++ sb->s_dirt = 1;
+
+ prepared = test_clear_buffer_journal_prepared(bh);
+ clear_buffer_journal_restore_dirty(bh);
+ /* already in this transaction, we are done */
+ if (buffer_journaled(bh)) {
+- PROC_INFO_INC(p_s_sb, journal.mark_dirty_already);
++ PROC_INFO_INC(sb, journal.mark_dirty_already);
+ return 0;
+ }
+
+@@ -3271,7 +3271,7 @@ int journal_mark_dirty(struct reiserfs_t
+ ** could get to disk too early. NOT GOOD.
+ */
+ if (!prepared || buffer_dirty(bh)) {
+- reiserfs_warning(p_s_sb, "journal-1777",
++ reiserfs_warning(sb, "journal-1777",
+ "buffer %llu bad state "
+ "%cPREPARED %cLOCKED %cDIRTY %cJDIRTY_WAIT",
+ (unsigned long long)bh->b_blocknr,
+@@ -3282,7 +3282,7 @@ int journal_mark_dirty(struct reiserfs_t
+ }
+
+ if (atomic_read(&(journal->j_wcount)) <= 0) {
+- reiserfs_warning(p_s_sb, "journal-1409",
++ reiserfs_warning(sb, "journal-1409",
+ "returning because j_wcount was %d",
+ atomic_read(&(journal->j_wcount)));
+ return 1;
+@@ -3298,7 +3298,7 @@ int journal_mark_dirty(struct reiserfs_t
+
+ if (buffer_journal_dirty(bh)) {
+ count_already_incd = 1;
+- PROC_INFO_INC(p_s_sb, journal.mark_dirty_notjournal);
++ PROC_INFO_INC(sb, journal.mark_dirty_notjournal);
+ clear_buffer_journal_dirty(bh);
+ }
+
+@@ -3310,10 +3310,9 @@ int journal_mark_dirty(struct reiserfs_t
+
+ /* now put this guy on the end */
+ if (!cn) {
+- cn = get_cnode(p_s_sb);
++ cn = get_cnode(sb);
+ if (!cn) {
+- reiserfs_panic(p_s_sb, "journal-4",
+- "get_cnode failed!");
++ reiserfs_panic(sb, "journal-4", "get_cnode failed!");
+ }
+
+ if (th->t_blocks_logged == th->t_blocks_allocated) {
+@@ -3325,7 +3324,7 @@ int journal_mark_dirty(struct reiserfs_t
+
+ cn->bh = bh;
+ cn->blocknr = bh->b_blocknr;
+- cn->sb = p_s_sb;
++ cn->sb = sb;
+ cn->jlist = NULL;
+ insert_journal_hash(journal->j_hash_table, cn);
+ if (!count_already_incd) {
+@@ -3346,10 +3345,10 @@ int journal_mark_dirty(struct reiserfs_t
+ }
+
+ int journal_end(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks)
++ struct super_block *sb, unsigned long nblocks)
+ {
+ if (!current->journal_info && th->t_refcount > 1)
+- reiserfs_warning(p_s_sb, "REISER-NESTING",
++ reiserfs_warning(sb, "REISER-NESTING",
+ "th NULL, refcount %d", th->t_refcount);
+
+ if (!th->t_trans_id) {
+@@ -3373,7 +3372,7 @@ int journal_end(struct reiserfs_transact
+ }
+ return 0;
+ } else {
+- return do_journal_end(th, p_s_sb, nblocks, 0);
++ return do_journal_end(th, sb, nblocks, 0);
+ }
+ }
+
+@@ -3384,15 +3383,15 @@ int journal_end(struct reiserfs_transact
+ **
+ ** returns 1 if it cleaned and relsed the buffer. 0 otherwise
+ */
+-static int remove_from_transaction(struct super_block *p_s_sb,
++static int remove_from_transaction(struct super_block *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);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ int ret = 0;
+
+- cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, blocknr);
++ cn = get_journal_hash_dev(sb, journal->j_hash_table, blocknr);
+ if (!cn || !cn->bh) {
+ return ret;
+ }
+@@ -3410,7 +3409,7 @@ static int remove_from_transaction(struc
+ journal->j_last = cn->prev;
+ }
+ if (bh)
+- remove_journal_hash(p_s_sb, journal->j_hash_table, NULL,
++ remove_journal_hash(sb, journal->j_hash_table, NULL,
+ bh->b_blocknr, 0);
+ clear_buffer_journaled(bh); /* don't log this one */
+
+@@ -3420,14 +3419,14 @@ static int remove_from_transaction(struc
+ clear_buffer_journal_test(bh);
+ put_bh(bh);
+ if (atomic_read(&(bh->b_count)) < 0) {
+- reiserfs_warning(p_s_sb, "journal-1752",
++ reiserfs_warning(sb, "journal-1752",
+ "b_count < 0");
+ }
+ ret = 1;
+ }
+ journal->j_len--;
+ journal->j_len_alloc--;
+- free_cnode(p_s_sb, cn);
++ free_cnode(sb, cn);
+ return ret;
+ }
+
+@@ -3478,19 +3477,19 @@ static int can_dirty(struct reiserfs_jou
+ ** will wait until the current transaction is done/committed before returning
+ */
+ int journal_end_sync(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks)
++ struct super_block *sb, unsigned long nblocks)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+ BUG_ON(!th->t_trans_id);
+ /* you can sync while nested, very, very bad */
+ BUG_ON(th->t_refcount > 1);
+ if (journal->j_len == 0) {
+- reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb),
++ reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb),
+ 1);
+- journal_mark_dirty(th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb));
++ journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb));
+ }
+- return do_journal_end(th, p_s_sb, nblocks, COMMIT_NOW | WAIT);
++ return do_journal_end(th, sb, nblocks, COMMIT_NOW | WAIT);
+ }
+
+ /*
+@@ -3500,7 +3499,7 @@ static void flush_async_commits(struct w
+ {
+ struct reiserfs_journal *journal =
+ container_of(work, struct reiserfs_journal, j_work.work);
+- struct super_block *p_s_sb = journal->j_work_sb;
++ struct super_block *sb = journal->j_work_sb;
+ struct reiserfs_journal_list *jl;
+ struct list_head *entry;
+
+@@ -3509,7 +3508,7 @@ static void flush_async_commits(struct w
+ /* last entry is the youngest, commit it and you get everything */
+ entry = journal->j_journal_list.prev;
+ jl = JOURNAL_LIST_ENTRY(entry);
+- flush_commit_list(p_s_sb, jl, 1);
++ flush_commit_list(sb, jl, 1);
+ }
+ unlock_kernel();
+ }
+@@ -3518,11 +3517,11 @@ static void flush_async_commits(struct w
+ ** flushes any old transactions to disk
+ ** ends the current transaction if it is too old
+ */
+-int reiserfs_flush_old_commits(struct super_block *p_s_sb)
++int reiserfs_flush_old_commits(struct super_block *sb)
+ {
+ time_t now;
+ struct reiserfs_transaction_handle th;
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+ now = get_seconds();
+ /* safety check so we don't flush while we are replaying the log during
+@@ -3539,20 +3538,20 @@ int reiserfs_flush_old_commits(struct su
+ journal->j_trans_start_time > 0 &&
+ journal->j_len > 0 &&
+ (now - journal->j_trans_start_time) > journal->j_max_trans_age) {
+- if (!journal_join(&th, p_s_sb, 1)) {
+- reiserfs_prepare_for_journal(p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb),
++ if (!journal_join(&th, sb, 1)) {
++ reiserfs_prepare_for_journal(sb,
++ SB_BUFFER_WITH_SB(sb),
+ 1);
+- journal_mark_dirty(&th, p_s_sb,
+- SB_BUFFER_WITH_SB(p_s_sb));
++ journal_mark_dirty(&th, sb,
++ SB_BUFFER_WITH_SB(sb));
+
+ /* we're only being called from kreiserfsd, it makes no sense to do
+ ** an async commit so that kreiserfsd can do it later
+ */
+- do_journal_end(&th, p_s_sb, 1, COMMIT_NOW | WAIT);
++ do_journal_end(&th, sb, 1, COMMIT_NOW | WAIT);
+ }
+ }
+- return p_s_sb->s_dirt;
++ return sb->s_dirt;
+ }
+
+ /*
+@@ -3567,7 +3566,7 @@ int reiserfs_flush_old_commits(struct su
+ ** Note, we can't allow the journal_end to proceed while there are still writers in the log.
+ */
+ static int check_journal_end(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks,
++ struct super_block *sb, unsigned long nblocks,
+ int flags)
+ {
+
+@@ -3576,7 +3575,7 @@ static int check_journal_end(struct reis
+ 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);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+
+ BUG_ON(!th->t_trans_id);
+
+@@ -3615,31 +3614,31 @@ static int check_journal_end(struct reis
+ if (flush) {
+ journal->j_next_full_flush = 1;
+ }
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+
+ /* sleep while the current transaction is still j_jlocked */
+ while (journal->j_trans_id == trans_id) {
+ if (atomic_read(&journal->j_jlock)) {
+- queue_log_writer(p_s_sb);
++ queue_log_writer(sb);
+ } else {
+- lock_journal(p_s_sb);
++ lock_journal(sb);
+ if (journal->j_trans_id == trans_id) {
+ atomic_set(&(journal->j_jlock),
+ 1);
+ }
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+ }
+ }
+ BUG_ON(journal->j_trans_id == trans_id);
+
+ if (commit_now
+- && journal_list_still_alive(p_s_sb, trans_id)
++ && journal_list_still_alive(sb, trans_id)
+ && wait_on_commit) {
+- flush_commit_list(p_s_sb, jl, 1);
++ flush_commit_list(sb, jl, 1);
+ }
+ return 0;
+ }
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+ return 0;
+ }
+
+@@ -3656,12 +3655,12 @@ static int check_journal_end(struct reis
+ && 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);
++ unlock_journal(sb);
+ return 0;
+ }
+
+- if (journal->j_start > SB_ONDISK_JOURNAL_SIZE(p_s_sb)) {
+- reiserfs_panic(p_s_sb, "journal-003",
++ if (journal->j_start > SB_ONDISK_JOURNAL_SIZE(sb)) {
++ reiserfs_panic(sb, "journal-003",
+ "j_start (%ld) is too high",
+ journal->j_start);
+ }
+@@ -3683,16 +3682,16 @@ static int check_journal_end(struct reis
+ ** 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 super_block *sb, b_blocknr_t blocknr)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_cnode *cn = NULL;
+ struct buffer_head *bh = NULL;
+ struct reiserfs_list_bitmap *jb = NULL;
+ int cleaned = 0;
+ BUG_ON(!th->t_trans_id);
+
+- cn = get_journal_hash_dev(p_s_sb, journal->j_hash_table, blocknr);
++ cn = get_journal_hash_dev(sb, journal->j_hash_table, blocknr);
+ if (cn && cn->bh) {
+ bh = cn->bh;
+ get_bh(bh);
+@@ -3702,15 +3701,15 @@ int journal_mark_freed(struct reiserfs_t
+ clear_buffer_journal_new(bh);
+ clear_prepared_bits(bh);
+ reiserfs_clean_and_file_buffer(bh);
+- cleaned = remove_from_transaction(p_s_sb, blocknr, cleaned);
++ cleaned = remove_from_transaction(sb, blocknr, cleaned);
+ } else {
+ /* set the bit for this block in the journal bitmap for this transaction */
+ jb = journal->j_current_jl->j_list_bitmap;
+ if (!jb) {
+- reiserfs_panic(p_s_sb, "journal-1702",
++ reiserfs_panic(sb, "journal-1702",
+ "journal_list_bitmap is NULL");
+ }
+- set_bit_in_list_bitmap(p_s_sb, blocknr, jb);
++ set_bit_in_list_bitmap(sb, blocknr, jb);
+
+ /* Note, the entire while loop is not allowed to schedule. */
+
+@@ -3718,13 +3717,13 @@ int journal_mark_freed(struct reiserfs_t
+ clear_prepared_bits(bh);
+ reiserfs_clean_and_file_buffer(bh);
+ }
+- cleaned = remove_from_transaction(p_s_sb, blocknr, cleaned);
++ cleaned = remove_from_transaction(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, journal->j_list_hash_table,
++ cn = get_journal_hash_dev(sb, journal->j_list_hash_table,
+ blocknr);
+ while (cn) {
+- if (p_s_sb == cn->sb && blocknr == cn->blocknr) {
++ if (sb == cn->sb && blocknr == cn->blocknr) {
+ set_bit(BLOCK_FREED, &cn->state);
+ if (cn->bh) {
+ if (!cleaned) {
+@@ -3740,7 +3739,7 @@ int journal_mark_freed(struct reiserfs_t
+ put_bh(cn->bh);
+ if (atomic_read
+ (&(cn->bh->b_count)) < 0) {
+- reiserfs_warning(p_s_sb,
++ reiserfs_warning(sb,
+ "journal-2138",
+ "cn->bh->b_count < 0");
+ }
+@@ -3847,18 +3846,18 @@ int reiserfs_commit_for_inode(struct ino
+ return __commit_trans_jl(inode, id, jl);
+ }
+
+-void reiserfs_restore_prepared_buffer(struct super_block *p_s_sb,
++void reiserfs_restore_prepared_buffer(struct super_block *sb,
+ struct buffer_head *bh)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
+- PROC_INFO_INC(p_s_sb, journal.restore_prepared);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
++ PROC_INFO_INC(sb, journal.restore_prepared);
+ if (!bh) {
+ return;
+ }
+ if (test_clear_buffer_journal_restore_dirty(bh) &&
+ buffer_journal_dirty(bh)) {
+ struct reiserfs_journal_cnode *cn;
+- cn = get_journal_hash_dev(p_s_sb,
++ cn = get_journal_hash_dev(sb,
+ journal->j_list_hash_table,
+ bh->b_blocknr);
+ if (cn && can_dirty(cn)) {
+@@ -3877,10 +3876,10 @@ extern struct tree_balance *cur_tb;
+ ** wait on it.
+ **
+ */
+-int reiserfs_prepare_for_journal(struct super_block *p_s_sb,
++int reiserfs_prepare_for_journal(struct super_block *sb,
+ struct buffer_head *bh, int wait)
+ {
+- PROC_INFO_INC(p_s_sb, journal.prepare);
++ PROC_INFO_INC(sb, journal.prepare);
+
+ if (!trylock_buffer(bh)) {
+ if (!wait)
+@@ -3928,10 +3927,10 @@ static void flush_old_journal_lists(stru
+ ** journal lists, etc just won't happen.
+ */
+ static int do_journal_end(struct reiserfs_transaction_handle *th,
+- struct super_block *p_s_sb, unsigned long nblocks,
++ struct super_block *sb, unsigned long nblocks,
+ int flags)
+ {
+- struct reiserfs_journal *journal = SB_JOURNAL(p_s_sb);
++ struct reiserfs_journal *journal = SB_JOURNAL(sb);
+ struct reiserfs_journal_cnode *cn, *next, *jl_cn;
+ struct reiserfs_journal_cnode *last_cn = NULL;
+ struct reiserfs_journal_desc *desc;
+@@ -3961,14 +3960,14 @@ static int do_journal_end(struct reiserf
+
+ put_fs_excl();
+ current->journal_info = th->t_handle_save;
+- reiserfs_check_lock_depth(p_s_sb, "journal end");
++ reiserfs_check_lock_depth(sb, "journal end");
+ if (journal->j_len == 0) {
+- reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb),
++ reiserfs_prepare_for_journal(sb, SB_BUFFER_WITH_SB(sb),
+ 1);
+- journal_mark_dirty(th, p_s_sb, SB_BUFFER_WITH_SB(p_s_sb));
++ journal_mark_dirty(th, sb, SB_BUFFER_WITH_SB(sb));
+ }
+
+- lock_journal(p_s_sb);
++ lock_journal(sb);
+ if (journal->j_next_full_flush) {
+ flags |= FLUSH_ALL;
+ flush = 1;
+@@ -3981,10 +3980,10 @@ static int do_journal_end(struct reiserf
+ /* check_journal_end locks the journal, and unlocks if it does not return 1
+ ** it tells us if we should continue with the journal_end, or just return
+ */
+- if (!check_journal_end(th, p_s_sb, nblocks, flags)) {
+- p_s_sb->s_dirt = 1;
+- wake_queued_writers(p_s_sb);
+- reiserfs_async_progress_wait(p_s_sb);
++ if (!check_journal_end(th, sb, nblocks, flags)) {
++ sb->s_dirt = 1;
++ wake_queued_writers(sb);
++ reiserfs_async_progress_wait(sb);
+ goto out;
+ }
+
+@@ -4013,8 +4012,8 @@ static int do_journal_end(struct reiserf
+
+ /* setup description block */
+ d_bh =
+- journal_getblk(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ journal_getblk(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ journal->j_start);
+ set_buffer_uptodate(d_bh);
+ desc = (struct reiserfs_journal_desc *)(d_bh)->b_data;
+@@ -4023,9 +4022,9 @@ static int do_journal_end(struct reiserf
+ 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) +
++ c_bh = journal_getblk(sb, SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ ((journal->j_start + journal->j_len +
+- 1) % SB_ONDISK_JOURNAL_SIZE(p_s_sb)));
++ 1) % SB_ONDISK_JOURNAL_SIZE(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, journal->j_trans_id);
+@@ -4058,12 +4057,12 @@ static int do_journal_end(struct reiserf
+ ** for each real block, add it to the journal list hash,
+ ** copy into real block index array in the commit or desc block
+ */
+- trans_half = journal_trans_half(p_s_sb->s_blocksize);
++ trans_half = journal_trans_half(sb->s_blocksize);
+ for (i = 0, cn = journal->j_first; cn; cn = cn->next, i++) {
+ if (buffer_journaled(cn->bh)) {
+- jl_cn = get_cnode(p_s_sb);
++ jl_cn = get_cnode(sb);
+ if (!jl_cn) {
+- reiserfs_panic(p_s_sb, "journal-1676",
++ reiserfs_panic(sb, "journal-1676",
+ "get_cnode returned NULL");
+ }
+ if (i == 0) {
+@@ -4079,15 +4078,15 @@ static int do_journal_end(struct reiserf
+ of journal or reserved area */
+
+ if (is_block_in_log_or_reserved_area
+- (p_s_sb, cn->bh->b_blocknr)) {
+- reiserfs_panic(p_s_sb, "journal-2332",
++ (sb, cn->bh->b_blocknr)) {
++ reiserfs_panic(sb, "journal-2332",
+ "Trying to log block %lu, "
+ "which is a log block",
+ cn->bh->b_blocknr);
+ }
+ jl_cn->blocknr = cn->bh->b_blocknr;
+ jl_cn->state = 0;
+- jl_cn->sb = p_s_sb;
++ jl_cn->sb = sb;
+ jl_cn->bh = cn->bh;
+ jl_cn->jlist = jl;
+ insert_journal_hash(journal->j_list_hash_table, jl_cn);
+@@ -4128,11 +4127,11 @@ static int do_journal_end(struct reiserf
+ char *addr;
+ struct page *page;
+ tmp_bh =
+- journal_getblk(p_s_sb,
+- SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) +
++ journal_getblk(sb,
++ SB_ONDISK_JOURNAL_1st_BLOCK(sb) +
+ ((cur_write_start +
+ jindex) %
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)));
++ SB_ONDISK_JOURNAL_SIZE(sb)));
+ set_buffer_uptodate(tmp_bh);
+ page = cn->bh->b_page;
+ addr = kmap(page);
+@@ -4146,13 +4145,13 @@ static int do_journal_end(struct reiserf
+ clear_buffer_journaled(cn->bh);
+ } else {
+ /* JDirty cleared sometime during transaction. don't log this one */
+- reiserfs_warning(p_s_sb, "journal-2048",
++ reiserfs_warning(sb, "journal-2048",
+ "BAD, buffer in journal hash, "
+ "but not JDirty!");
+ brelse(cn->bh);
+ }
+ next = cn->next;
+- free_cnode(p_s_sb, cn);
++ free_cnode(sb, cn);
+ cn = next;
+ cond_resched();
+ }
+@@ -4162,7 +4161,7 @@ static int do_journal_end(struct reiserf
+ ** so we dirty/relse c_bh in flush_commit_list, with commit_left <= 1.
+ */
+
+- journal->j_current_jl = alloc_journal_list(p_s_sb);
++ journal->j_current_jl = alloc_journal_list(sb);
+
+ /* now it is safe to insert this transaction on the main list */
+ list_add_tail(&jl->j_list, &journal->j_journal_list);
+@@ -4173,7 +4172,7 @@ static int do_journal_end(struct reiserf
+ old_start = journal->j_start;
+ journal->j_start =
+ (journal->j_start + journal->j_len +
+- 2) % SB_ONDISK_JOURNAL_SIZE(p_s_sb);
++ 2) % SB_ONDISK_JOURNAL_SIZE(sb);
+ atomic_set(&(journal->j_wcount), 0);
+ journal->j_bcount = 0;
+ journal->j_last = NULL;
+@@ -4188,7 +4187,7 @@ static int do_journal_end(struct reiserf
+ journal->j_len_alloc = 0;
+ journal->j_next_full_flush = 0;
+ journal->j_next_async_flush = 0;
+- init_journal_hash(p_s_sb);
++ init_journal_hash(sb);
+
+ // make sure reiserfs_add_jh sees the new current_jl before we
+ // write out the tails
+@@ -4217,8 +4216,8 @@ static int do_journal_end(struct reiserf
+ ** queue don't wait for this proc to flush journal lists and such.
+ */
+ if (flush) {
+- flush_commit_list(p_s_sb, jl, 1);
+- flush_journal_list(p_s_sb, jl, 1);
++ flush_commit_list(sb, jl, 1);
++ flush_journal_list(sb, jl, 1);
+ } else if (!(jl->j_state & LIST_COMMIT_PENDING))
+ queue_delayed_work(commit_wq, &journal->j_work, HZ / 10);
+
+@@ -4232,11 +4231,11 @@ static int do_journal_end(struct reiserf
+ 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);
++ flush_used_journal_lists(sb, temp_jl);
+ goto first_jl;
+ } else if ((journal->j_start +
+ journal->j_trans_max + 1) <
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)) {
++ SB_ONDISK_JOURNAL_SIZE(sb)) {
+ /* if we don't cross into the next transaction and we don't
+ * wrap, there is no way we can overlap any later transactions
+ * break now
+@@ -4245,11 +4244,11 @@ static int do_journal_end(struct reiserf
+ }
+ } else if ((journal->j_start +
+ journal->j_trans_max + 1) >
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)) {
++ SB_ONDISK_JOURNAL_SIZE(sb)) {
+ if (((journal->j_start + journal->j_trans_max + 1) %
+- SB_ONDISK_JOURNAL_SIZE(p_s_sb)) >=
++ SB_ONDISK_JOURNAL_SIZE(sb)) >=
+ temp_jl->j_start) {
+- flush_used_journal_lists(p_s_sb, temp_jl);
++ flush_used_journal_lists(sb, temp_jl);
+ goto first_jl;
+ } else {
+ /* we don't overlap anything from out start to the end of the
+@@ -4260,34 +4259,34 @@ static int do_journal_end(struct reiserf
+ }
+ }
+ }
+- flush_old_journal_lists(p_s_sb);
++ flush_old_journal_lists(sb);
+
+ journal->j_current_jl->j_list_bitmap =
+- get_list_bitmap(p_s_sb, journal->j_current_jl);
++ get_list_bitmap(sb, journal->j_current_jl);
+
+ if (!(journal->j_current_jl->j_list_bitmap)) {
+- reiserfs_panic(p_s_sb, "journal-1996",
++ reiserfs_panic(sb, "journal-1996",
+ "could not get a list bitmap");
+ }
+
+ atomic_set(&(journal->j_jlock), 0);
+- unlock_journal(p_s_sb);
++ unlock_journal(sb);
+ /* wake up any body waiting to join. */
+ clear_bit(J_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)) {
+- flush_commit_list(p_s_sb, jl, 1);
++ journal_list_still_alive(sb, commit_trans_id)) {
++ flush_commit_list(sb, jl, 1);
+ }
+ out:
+- reiserfs_check_lock_depth(p_s_sb, "journal end2");
++ reiserfs_check_lock_depth(sb, "journal end2");
+
+ memset(th, 0, sizeof(*th));
+ /* Re-set th->t_super, so we can properly keep track of how many
+ * persistent transactions there are. We need to do this so if this
+ * call is part of a failed restart_transaction, we can free it later */
+- th->t_super = p_s_sb;
++ th->t_super = sb;
+
+ return journal->j_errno;
+ }
+--- a/fs/reiserfs/stree.c
++++ b/fs/reiserfs/stree.c
+@@ -245,7 +245,7 @@ static const struct reiserfs_key MAX_KEY
+ static inline const struct reiserfs_key *get_lkey(const struct treepath
+ *p_s_chk_path,
+ const struct super_block
+- *p_s_sb)
++ *sb)
+ {
+ int n_position, n_path_offset = p_s_chk_path->path_length;
+ struct buffer_head *p_s_parent;
+@@ -282,14 +282,14 @@ static inline const struct reiserfs_key
+ }
+ /* Return MIN_KEY if we are in the root of the buffer tree. */
+ if (PATH_OFFSET_PBUFFER(p_s_chk_path, FIRST_PATH_ELEMENT_OFFSET)->
+- b_blocknr == SB_ROOT_BLOCK(p_s_sb))
++ b_blocknr == SB_ROOT_BLOCK(sb))
+ return &MIN_KEY;
+ return &MAX_KEY;
+ }
+
+ /* Get delimiting key of the buffer at the path and its right neighbor. */
+ inline const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path,
+- const struct super_block *p_s_sb)
++ const struct super_block *sb)
+ {
+ int n_position, n_path_offset = p_s_chk_path->path_length;
+ struct buffer_head *p_s_parent;
+@@ -325,7 +325,7 @@ inline const struct reiserfs_key *get_rk
+ }
+ /* Return MAX_KEY if we are in the root of the buffer tree. */
+ if (PATH_OFFSET_PBUFFER(p_s_chk_path, FIRST_PATH_ELEMENT_OFFSET)->
+- b_blocknr == SB_ROOT_BLOCK(p_s_sb))
++ b_blocknr == SB_ROOT_BLOCK(sb))
+ return &MAX_KEY;
+ return &MIN_KEY;
+ }
+@@ -337,7 +337,7 @@ inline const struct reiserfs_key *get_rk
+ this case get_lkey and get_rkey return a special key which is MIN_KEY or MAX_KEY. */
+ static inline int key_in_buffer(struct treepath *p_s_chk_path, /* Path which should be checked. */
+ const struct cpu_key *p_s_key, /* Key which should be checked. */
+- struct super_block *p_s_sb /* Super block pointer. */
++ struct super_block *sb /* Super block pointer. */
+ )
+ {
+
+@@ -348,11 +348,11 @@ static inline int key_in_buffer(struct t
+ RFALSE(!PATH_PLAST_BUFFER(p_s_chk_path)->b_bdev,
+ "PAP-5060: device must not be NODEV");
+
+- if (comp_keys(get_lkey(p_s_chk_path, p_s_sb), p_s_key) == 1)
++ if (comp_keys(get_lkey(p_s_chk_path, sb), p_s_key) == 1)
+ /* left delimiting key is bigger, that the key we look for */
+ return 0;
+- // if ( comp_keys(p_s_key, get_rkey(p_s_chk_path, p_s_sb)) != -1 )
+- if (comp_keys(get_rkey(p_s_chk_path, p_s_sb), p_s_key) != 1)
++ // if ( comp_keys(p_s_key, get_rkey(p_s_chk_path, sb)) != -1 )
++ if (comp_keys(get_rkey(p_s_chk_path, sb), p_s_key) != 1)
+ /* p_s_key must be less than right delimitiing key */
+ return 0;
+ return 1;
+@@ -546,7 +546,7 @@ static void search_by_key_reada(struct s
+ /**************************************************************************
+ * Algorithm SearchByKey *
+ * look for item in the Disk S+Tree by its key *
+- * Input: p_s_sb - super block *
++ * Input: sb - super block *
+ * p_s_key - pointer to the key to search *
+ * Output: ITEM_FOUND, ITEM_NOT_FOUND or IO_ERROR *
+ * p_s_search_path - path from the root to the needed leaf *
+@@ -566,7 +566,7 @@ static void search_by_key_reada(struct s
+ correctness of the top of the path but need not be checked for the
+ correctness of the bottom of the path */
+ /* The function is NOT SCHEDULE-SAFE! */
+-int search_by_key(struct super_block *p_s_sb, const struct cpu_key *p_s_key, /* Key to search. */
++int search_by_key(struct super_block *sb, const struct cpu_key *p_s_key, /* Key to search. */
+ struct treepath *p_s_search_path,/* This structure was
+ allocated and initialized
+ by the calling
+@@ -592,7 +592,7 @@ int search_by_key(struct super_block *p_
+ int n_repeat_counter = 0;
+ #endif
+
+- PROC_INFO_INC(p_s_sb, search_by_key);
++ PROC_INFO_INC(sb, search_by_key);
+
+ /* As we add each node to a path we increase its count. This means that
+ we must be careful to release all nodes in a path before we either
+@@ -605,13 +605,13 @@ int search_by_key(struct super_block *p_
+ /* With each iteration of this loop we search through the items in the
+ current node, and calculate the next current node(next path element)
+ for the next iteration of this loop.. */
+- n_block_number = SB_ROOT_BLOCK(p_s_sb);
++ n_block_number = SB_ROOT_BLOCK(sb);
+ expected_level = -1;
+ while (1) {
+
+ #ifdef CONFIG_REISERFS_CHECK
+ if (!(++n_repeat_counter % 50000))
+- reiserfs_warning(p_s_sb, "PAP-5100",
++ reiserfs_warning(sb, "PAP-5100",
+ "%s: there were %d iterations of "
+ "while loop looking for key %K",
+ current->comm, n_repeat_counter,
+@@ -622,14 +622,14 @@ int search_by_key(struct super_block *p_
+ p_s_last_element =
+ PATH_OFFSET_PELEMENT(p_s_search_path,
+ ++p_s_search_path->path_length);
+- fs_gen = get_generation(p_s_sb);
++ fs_gen = get_generation(sb);
+
+ /* Read the next tree node, and set the last element in the path to
+ have a pointer to it. */
+ if ((p_s_bh = p_s_last_element->pe_buffer =
+- sb_getblk(p_s_sb, n_block_number))) {
++ sb_getblk(sb, n_block_number))) {
+ if (!buffer_uptodate(p_s_bh) && reada_count > 1) {
+- search_by_key_reada(p_s_sb, reada_bh,
++ search_by_key_reada(sb, reada_bh,
+ reada_blocks, reada_count);
+ }
+ ll_rw_block(READ, 1, &p_s_bh);
+@@ -644,25 +644,25 @@ int search_by_key(struct super_block *p_
+ }
+ reada_count = 0;
+ if (expected_level == -1)
+- expected_level = SB_TREE_HEIGHT(p_s_sb);
++ expected_level = SB_TREE_HEIGHT(sb);
+ expected_level--;
+
+ /* It is possible that schedule occurred. We must check whether the key
+ to search is still in the tree rooted from the current buffer. If
+ not then repeat search from the root. */
+- if (fs_changed(fs_gen, p_s_sb) &&
++ if (fs_changed(fs_gen, sb) &&
+ (!B_IS_IN_TREE(p_s_bh) ||
+ B_LEVEL(p_s_bh) != expected_level ||
+- !key_in_buffer(p_s_search_path, p_s_key, p_s_sb))) {
+- PROC_INFO_INC(p_s_sb, search_by_key_fs_changed);
+- PROC_INFO_INC(p_s_sb, search_by_key_restarted);
+- PROC_INFO_INC(p_s_sb,
++ !key_in_buffer(p_s_search_path, p_s_key, sb))) {
++ PROC_INFO_INC(sb, search_by_key_fs_changed);
++ PROC_INFO_INC(sb, search_by_key_restarted);
++ PROC_INFO_INC(sb,
+ sbk_restarted[expected_level - 1]);
+ pathrelse(p_s_search_path);
+
+ /* Get the root block number so that we can repeat the search
+ starting from the root. */
+- n_block_number = SB_ROOT_BLOCK(p_s_sb);
++ n_block_number = SB_ROOT_BLOCK(sb);
+ expected_level = -1;
+ right_neighbor_of_leaf_node = 0;
+
+@@ -674,12 +674,12 @@ int search_by_key(struct super_block *p_
+ equal to the MAX_KEY. Latter case is only possible in
+ "finish_unfinished()" processing during mount. */
+ RFALSE(comp_keys(&MAX_KEY, p_s_key) &&
+- !key_in_buffer(p_s_search_path, p_s_key, p_s_sb),
++ !key_in_buffer(p_s_search_path, p_s_key, sb),
+ "PAP-5130: key is not in the buffer");
+ #ifdef CONFIG_REISERFS_CHECK
+ if (cur_tb) {
+ print_cur_tb("5140");
+- reiserfs_panic(p_s_sb, "PAP-5140",
++ reiserfs_panic(sb, "PAP-5140",
+ "schedule occurred in do_balance!");
+ }
+ #endif
+@@ -687,7 +687,7 @@ int search_by_key(struct super_block *p_
+ // make sure, that the node contents look like a node of
+ // certain level
+ if (!is_tree_node(p_s_bh, expected_level)) {
+- reiserfs_error(p_s_sb, "vs-5150",
++ reiserfs_error(sb, "vs-5150",
+ "invalid format found in block %ld. "
+ "Fsck?", p_s_bh->b_blocknr);
+ pathrelse(p_s_search_path);
+@@ -697,7 +697,7 @@ int search_by_key(struct super_block *p_
+ /* ok, we have acquired next formatted node in the tree */
+ n_node_level = B_LEVEL(p_s_bh);
+
+- PROC_INFO_BH_STAT(p_s_sb, p_s_bh, n_node_level - 1);
++ PROC_INFO_BH_STAT(sb, p_s_bh, n_node_level - 1);
+
+ RFALSE(n_node_level < n_stop_level,
+ "vs-5152: tree level (%d) is less than stop level (%d)",
+@@ -776,7 +776,7 @@ int search_by_key(struct super_block *p_
+ units of directory entries. */
+
+ /* The function is NOT SCHEDULE-SAFE! */
+-int search_for_position_by_key(struct super_block *p_s_sb, /* Pointer to the super block. */
++int search_for_position_by_key(struct super_block *sb, /* Pointer to the super block. */
+ const struct cpu_key *p_cpu_key, /* Key to search (cpu variable) */
+ struct treepath *p_s_search_path /* Filled up by this function. */
+ )
+@@ -789,13 +789,13 @@ int search_for_position_by_key(struct su
+
+ /* If searching for directory entry. */
+ if (is_direntry_cpu_key(p_cpu_key))
+- return search_by_entry_key(p_s_sb, p_cpu_key, p_s_search_path,
++ return search_by_entry_key(sb, p_cpu_key, p_s_search_path,
+ &de);
+
+ /* If not searching for directory entry. */
+
+ /* If item is found. */
+- retval = search_item(p_s_sb, p_cpu_key, p_s_search_path);
++ retval = search_item(sb, p_cpu_key, p_s_search_path);
+ if (retval == IO_ERROR)
+ return retval;
+ if (retval == ITEM_FOUND) {
+@@ -817,7 +817,7 @@ int search_for_position_by_key(struct su
+ p_le_ih =
+ B_N_PITEM_HEAD(PATH_PLAST_BUFFER(p_s_search_path),
+ --PATH_LAST_POSITION(p_s_search_path));
+- n_blk_size = p_s_sb->s_blocksize;
++ n_blk_size = sb->s_blocksize;
+
+ if (comp_short_keys(&(p_le_ih->ih_key), p_cpu_key)) {
+ return FILE_NOT_FOUND;
+@@ -957,7 +957,7 @@ static char prepare_for_delete_or_cut(st
+ int *p_n_cut_size, unsigned long long n_new_file_length /* MAX_KEY_OFFSET in case of delete. */
+ )
+ {
+- struct super_block *p_s_sb = inode->i_sb;
++ struct super_block *sb = inode->i_sb;
+ struct item_head *p_le_ih = PATH_PITEM_HEAD(p_s_path);
+ struct buffer_head *p_s_bh = PATH_PLAST_BUFFER(p_s_path);
+
+@@ -986,7 +986,7 @@ static char prepare_for_delete_or_cut(st
+
+ /* Case of an indirect item. */
+ {
+- int blk_size = p_s_sb->s_blocksize;
++ int blk_size = sb->s_blocksize;
+ struct item_head s_ih;
+ int need_re_search;
+ int delete = 0;
+@@ -1023,9 +1023,9 @@ static char prepare_for_delete_or_cut(st
+ block = get_block_num(unfm, 0);
+
+ if (block != 0) {
+- reiserfs_prepare_for_journal(p_s_sb, p_s_bh, 1);
++ reiserfs_prepare_for_journal(sb, p_s_bh, 1);
+ put_block_num(unfm, 0, 0);
+- journal_mark_dirty (th, p_s_sb, p_s_bh);
++ journal_mark_dirty (th, sb, p_s_bh);
+ reiserfs_free_block(th, inode, block, 1);
+ }
+
+@@ -1049,9 +1049,9 @@ static char prepare_for_delete_or_cut(st
+ /* a trick. If the buffer has been logged, this will do nothing. If
+ ** we've broken the loop without logging it, it will restore the
+ ** buffer */
+- reiserfs_restore_prepared_buffer(p_s_sb, p_s_bh);
++ reiserfs_restore_prepared_buffer(sb, p_s_bh);
+ } while (need_re_search &&
+- search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path) == POSITION_FOUND);
++ search_for_position_by_key(sb, p_s_item_key, p_s_path) == POSITION_FOUND);
+ pos_in_item(p_s_path) = pos * UNFM_P_SIZE;
+
+ if (*p_n_cut_size == 0) {
+@@ -1090,7 +1090,7 @@ static int calc_deleted_bytes_number(str
+
+ static void init_tb_struct(struct reiserfs_transaction_handle *th,
+ struct tree_balance *p_s_tb,
+- struct super_block *p_s_sb,
++ struct super_block *sb,
+ struct treepath *p_s_path, int n_size)
+ {
+
+@@ -1098,7 +1098,7 @@ static void init_tb_struct(struct reiser
+
+ memset(p_s_tb, '\0', sizeof(struct tree_balance));
+ p_s_tb->transaction_handle = th;
+- p_s_tb->tb_sb = p_s_sb;
++ p_s_tb->tb_sb = sb;
+ p_s_tb->tb_path = p_s_path;
+ PATH_OFFSET_PBUFFER(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = NULL;
+ PATH_OFFSET_POSITION(p_s_path, ILLEGAL_PATH_ELEMENT_OFFSET) = 0;
+@@ -1147,7 +1147,7 @@ int reiserfs_delete_item(struct reiserfs
+ struct inode *p_s_inode, /* inode is here just to update i_blocks and quotas */
+ struct buffer_head *p_s_un_bh)
+ { /* NULL or unformatted node pointer. */
+- struct super_block *p_s_sb = p_s_inode->i_sb;
++ struct super_block *sb = p_s_inode->i_sb;
+ struct tree_balance s_del_balance;
+ struct item_head s_ih;
+ struct item_head *q_ih;
+@@ -1161,7 +1161,7 @@ int reiserfs_delete_item(struct reiserfs
+
+ BUG_ON(!th->t_trans_id);
+
+- init_tb_struct(th, &s_del_balance, p_s_sb, p_s_path,
++ init_tb_struct(th, &s_del_balance, sb, p_s_path,
+ 0 /*size is unknown */ );
+
+ while (1) {
+@@ -1185,15 +1185,15 @@ int reiserfs_delete_item(struct reiserfs
+ if (n_ret_value != REPEAT_SEARCH)
+ break;
+
+- PROC_INFO_INC(p_s_sb, delete_item_restarted);
++ PROC_INFO_INC(sb, delete_item_restarted);
+
+ // file system changed, repeat search
+ n_ret_value =
+- search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path);
++ search_for_position_by_key(sb, p_s_item_key, p_s_path);
+ if (n_ret_value == IO_ERROR)
+ break;
+ if (n_ret_value == FILE_NOT_FOUND) {
+- reiserfs_warning(p_s_sb, "vs-5340",
++ reiserfs_warning(sb, "vs-5340",
+ "no items of the file %K found",
+ p_s_item_key);
+ break;
+@@ -1216,8 +1216,8 @@ int reiserfs_delete_item(struct reiserfs
+ ** the unfm node once
+ */
+ if (!S_ISLNK(p_s_inode->i_mode) && is_direct_le_ih(q_ih)) {
+- if ((le_ih_k_offset(q_ih) & (p_s_sb->s_blocksize - 1)) == 1) {
+- quota_cut_bytes = p_s_sb->s_blocksize + UNFM_P_SIZE;
++ if ((le_ih_k_offset(q_ih) & (sb->s_blocksize - 1)) == 1) {
++ quota_cut_bytes = sb->s_blocksize + UNFM_P_SIZE;
+ } else {
+ quota_cut_bytes = 0;
+ }
+@@ -1258,7 +1258,7 @@ int reiserfs_delete_item(struct reiserfs
+ do_balance(&s_del_balance, NULL, NULL, M_DELETE);
+
+ #ifdef REISERQUOTA_DEBUG
+- reiserfs_debug(p_s_sb, REISERFS_DEBUG_CODE,
++ reiserfs_debug(sb, REISERFS_DEBUG_CODE,
+ "reiserquota delete_item(): freeing %u, id=%u type=%c",
+ quota_cut_bytes, p_s_inode->i_uid, head2type(&s_ih));
+ #endif
+@@ -1430,8 +1430,8 @@ static int maybe_indirect_to_direct(stru
+ const struct cpu_key *p_s_item_key,
+ loff_t n_new_file_size, char *p_c_mode)
+ {
+- struct super_block *p_s_sb = p_s_inode->i_sb;
+- int n_block_size = p_s_sb->s_blocksize;
++ struct super_block *sb = p_s_inode->i_sb;
++ int n_block_size = sb->s_blocksize;
+ int cut_bytes;
+ BUG_ON(!th->t_trans_id);
+ BUG_ON(n_new_file_size != p_s_inode->i_size);
+@@ -1509,7 +1509,7 @@ int reiserfs_cut_from_item(struct reiser
+ struct inode *p_s_inode,
+ struct page *page, loff_t n_new_file_size)
+ {
+- struct super_block *p_s_sb = p_s_inode->i_sb;
++ struct super_block *sb = p_s_inode->i_sb;
+ /* Every function which is going to call do_balance must first
+ create a tree_balance structure. Then it must fill up this
+ structure by using the init_tb_struct and fix_nodes functions.
+@@ -1560,7 +1560,7 @@ int reiserfs_cut_from_item(struct reiser
+ /* removing of last unformatted node will change value we
+ have to return to truncate. Save it */
+ retval2 = n_ret_value;
+- /*retval2 = p_s_sb->s_blocksize - (n_new_file_size & (p_s_sb->s_blocksize - 1)); */
++ /*retval2 = sb->s_blocksize - (n_new_file_size & (sb->s_blocksize - 1)); */
+
+ /* So, we have performed the first part of the conversion:
+ inserting the new direct item. Now we are removing the
+@@ -1569,16 +1569,16 @@ int reiserfs_cut_from_item(struct reiser
+ set_cpu_key_k_type(p_s_item_key, TYPE_INDIRECT);
+ p_s_item_key->key_length = 4;
+ n_new_file_size -=
+- (n_new_file_size & (p_s_sb->s_blocksize - 1));
++ (n_new_file_size & (sb->s_blocksize - 1));
+ tail_pos = n_new_file_size;
+ set_cpu_key_k_offset(p_s_item_key, n_new_file_size + 1);
+ if (search_for_position_by_key
+- (p_s_sb, p_s_item_key,
++ (sb, p_s_item_key,
+ p_s_path) == POSITION_NOT_FOUND) {
+ print_block(PATH_PLAST_BUFFER(p_s_path), 3,
+ PATH_LAST_POSITION(p_s_path) - 1,
+ PATH_LAST_POSITION(p_s_path) + 1);
+- reiserfs_panic(p_s_sb, "PAP-5580", "item to "
++ reiserfs_panic(sb, "PAP-5580", "item to "
+ "convert does not exist (%K)",
+ p_s_item_key);
+ }
+@@ -1595,14 +1595,14 @@ int reiserfs_cut_from_item(struct reiser
+ if (n_ret_value != REPEAT_SEARCH)
+ break;
+
+- PROC_INFO_INC(p_s_sb, cut_from_item_restarted);
++ PROC_INFO_INC(sb, cut_from_item_restarted);
+
+ n_ret_value =
+- search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path);
++ search_for_position_by_key(sb, p_s_item_key, p_s_path);
+ if (n_ret_value == POSITION_FOUND)
+ continue;
+
+- reiserfs_warning(p_s_sb, "PAP-5610", "item %K not found",
++ reiserfs_warning(sb, "PAP-5610", "item %K not found",
+ p_s_item_key);
+ unfix_nodes(&s_cut_balance);
+ return (n_ret_value == IO_ERROR) ? -EIO : -ENOENT;
+@@ -1616,7 +1616,7 @@ int reiserfs_cut_from_item(struct reiser
+ indirect_to_direct_roll_back(th, p_s_inode, p_s_path);
+ }
+ if (n_ret_value == NO_DISK_SPACE)
+- reiserfs_warning(p_s_sb, "reiserfs-5092",
++ reiserfs_warning(sb, "reiserfs-5092",
+ "NO_DISK_SPACE");
+ unfix_nodes(&s_cut_balance);
+ return -EIO;
+@@ -1642,11 +1642,11 @@ int reiserfs_cut_from_item(struct reiser
+ p_le_ih = PATH_PITEM_HEAD(s_cut_balance.tb_path);
+ if (!S_ISLNK(p_s_inode->i_mode) && is_direct_le_ih(p_le_ih)) {
+ if (c_mode == M_DELETE &&
+- (le_ih_k_offset(p_le_ih) & (p_s_sb->s_blocksize - 1)) ==
++ (le_ih_k_offset(p_le_ih) & (sb->s_blocksize - 1)) ==
+ 1) {
+ // FIXME: this is to keep 3.5 happy
+ REISERFS_I(p_s_inode)->i_first_direct_byte = U32_MAX;
+- quota_cut_bytes = p_s_sb->s_blocksize + UNFM_P_SIZE;
++ quota_cut_bytes = sb->s_blocksize + UNFM_P_SIZE;
+ } else {
+ quota_cut_bytes = 0;
+ }
+@@ -1659,18 +1659,18 @@ int reiserfs_cut_from_item(struct reiser
+ sure, that we exactly remove last unformatted node pointer
+ of the item */
+ if (!is_indirect_le_ih(le_ih))
+- reiserfs_panic(p_s_sb, "vs-5652",
++ reiserfs_panic(sb, "vs-5652",
+ "item must be indirect %h", le_ih);
+
+ if (c_mode == M_DELETE && ih_item_len(le_ih) != UNFM_P_SIZE)
+- reiserfs_panic(p_s_sb, "vs-5653", "completing "
++ reiserfs_panic(sb, "vs-5653", "completing "
+ "indirect2direct conversion indirect "
+ "item %h being deleted must be of "
+ "4 byte long", le_ih);
+
+ if (c_mode == M_CUT
+ && s_cut_balance.insert_size[0] != -UNFM_P_SIZE) {
+- reiserfs_panic(p_s_sb, "vs-5654", "can not complete "
++ reiserfs_panic(sb, "vs-5654", "can not complete "
+ "indirect2direct conversion of %h "
+ "(CUT, insert_size==%d)",
+ le_ih, s_cut_balance.insert_size[0]);
+--- a/fs/reiserfs/tail_conversion.c
++++ b/fs/reiserfs/tail_conversion.c
+@@ -175,9 +175,9 @@ int indirect2direct(struct reiserfs_tran
+ loff_t n_new_file_size, /* New file size. */
+ char *p_c_mode)
+ {
+- struct super_block *p_s_sb = p_s_inode->i_sb;
++ struct super_block *sb = p_s_inode->i_sb;
+ struct item_head s_ih;
+- unsigned long n_block_size = p_s_sb->s_blocksize;
++ unsigned long n_block_size = sb->s_blocksize;
+ char *tail;
+ int tail_len, round_tail_len;
+ loff_t pos, pos1; /* position of first byte of the tail */
+@@ -185,7 +185,7 @@ int indirect2direct(struct reiserfs_tran
+
+ BUG_ON(!th->t_trans_id);
+
+- REISERFS_SB(p_s_sb)->s_indirect2direct++;
++ REISERFS_SB(sb)->s_indirect2direct++;
+
+ *p_c_mode = M_SKIP_BALANCING;
+
+@@ -200,7 +200,7 @@ int indirect2direct(struct reiserfs_tran
+
+ pos =
+ le_ih_k_offset(&s_ih) - 1 + (ih_item_len(&s_ih) / UNFM_P_SIZE -
+- 1) * p_s_sb->s_blocksize;
++ 1) * sb->s_blocksize;
+ pos1 = pos;
+
+ // we are protected by i_mutex. The tail can not disapper, not
+@@ -211,18 +211,18 @@ int indirect2direct(struct reiserfs_tran
+
+ if (path_changed(&s_ih, p_s_path)) {
+ /* re-search indirect item */
+- if (search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path)
++ if (search_for_position_by_key(sb, p_s_item_key, p_s_path)
+ == POSITION_NOT_FOUND)
+- reiserfs_panic(p_s_sb, "PAP-5520",
++ reiserfs_panic(sb, "PAP-5520",
+ "item to be converted %K does not exist",
+ p_s_item_key);
+ copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path));
+ #ifdef CONFIG_REISERFS_CHECK
+ pos = le_ih_k_offset(&s_ih) - 1 +
+ (ih_item_len(&s_ih) / UNFM_P_SIZE -
+- 1) * p_s_sb->s_blocksize;
++ 1) * sb->s_blocksize;
+ if (pos != pos1)
+- reiserfs_panic(p_s_sb, "vs-5530", "tail position "
++ reiserfs_panic(sb, "vs-5530", "tail position "
+ "changed while we were reading it");
+ #endif
+ }
+--- a/include/linux/reiserfs_fs.h
++++ b/include/linux/reiserfs_fs.h
+@@ -1769,12 +1769,12 @@ int journal_end_sync(struct reiserfs_tra
+ int journal_mark_freed(struct reiserfs_transaction_handle *,
+ struct super_block *, b_blocknr_t blocknr);
+ int journal_transaction_should_end(struct reiserfs_transaction_handle *, int);
+-int reiserfs_in_journal(struct super_block *p_s_sb, unsigned int bmap_nr,
+- int bit_nr, int searchall, b_blocknr_t *next);
++int reiserfs_in_journal(struct super_block *sb, unsigned int bmap_nr,
++ int bit_nr, int searchall, b_blocknr_t *next);
+ int journal_begin(struct reiserfs_transaction_handle *,
+- struct super_block *p_s_sb, unsigned long);
++ struct super_block *sb, unsigned long);
+ int journal_join_abort(struct reiserfs_transaction_handle *,
+- struct super_block *p_s_sb, unsigned long);
++ struct super_block *sb, unsigned long);
+ void reiserfs_abort_journal(struct super_block *sb, int errno);
+ void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...);
+ int reiserfs_allocate_list_bitmaps(struct super_block *s,
+@@ -1830,11 +1830,11 @@ static inline void copy_key(struct reise
+
+ int comp_items(const struct item_head *stored_ih, const struct treepath *p_s_path);
+ const struct reiserfs_key *get_rkey(const struct treepath *p_s_chk_path,
+- const struct super_block *p_s_sb);
++ const struct super_block *sb);
+ int search_by_key(struct super_block *, const struct cpu_key *,
+ struct treepath *, int);
+ #define search_item(s,key,path) search_by_key (s, key, path, DISK_LEAF_NODE_LEVEL)
+-int search_for_position_by_key(struct super_block *p_s_sb,
++int search_for_position_by_key(struct super_block *sb,
+ const struct cpu_key *p_s_cpu_key,
+ struct treepath *p_s_search_path);
+ extern void decrement_bcount(struct buffer_head *p_s_bh);
+@@ -1978,7 +1978,7 @@ int reiserfs_global_version_in_proc(char
+ #define PROC_INFO_MAX( sb, field, value ) VOID_V
+ #define PROC_INFO_INC( sb, field ) VOID_V
+ #define PROC_INFO_ADD( sb, field, val ) VOID_V
+-#define PROC_INFO_BH_STAT( p_s_sb, p_s_bh, n_node_level ) VOID_V
++#define PROC_INFO_BH_STAT(sb, p_s_bh, n_node_level) VOID_V
+ #endif
+
+ /* dir.c */
projects / people / pmueller / ipfire-2.x.git / blobdiff