From: Chris Mason reiserfs cleanup, get rid of old debugging code. --- 25-akpm/fs/reiserfs/do_balan.c | 2 - 25-akpm/fs/reiserfs/file.c | 3 - 25-akpm/fs/reiserfs/fix_node.c | 5 --- 25-akpm/fs/reiserfs/inode.c | 12 ------- 25-akpm/fs/reiserfs/journal.c | 55 --------------------------------- 25-akpm/fs/reiserfs/namei.c | 18 ---------- 25-akpm/fs/reiserfs/prints.c | 1 25-akpm/include/linux/reiserfs_fs.h | 2 - 25-akpm/include/linux/reiserfs_fs_sb.h | 1 9 files changed, 99 deletions(-) diff -puN fs/reiserfs/do_balan.c~reiserfs-journal-writer fs/reiserfs/do_balan.c --- 25/fs/reiserfs/do_balan.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/do_balan.c Wed Mar 24 15:14:32 2004 @@ -54,9 +54,7 @@ inline void do_balance_mark_leaf_dirty ( tb->need_balance_dirty = 1; } } else { - int windex = push_journal_writer("do_balance") ; journal_mark_dirty(tb->transaction_handle, tb->transaction_handle->t_super, bh) ; - pop_journal_writer(windex) ; } } diff -puN fs/reiserfs/file.c~reiserfs-journal-writer fs/reiserfs/file.c --- 25/fs/reiserfs/file.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/file.c Wed Mar 24 15:14:32 2004 @@ -29,7 +29,6 @@ static int reiserfs_file_release (struct { struct reiserfs_transaction_handle th ; - int windex ; if (!S_ISREG (inode->i_mode)) BUG (); @@ -59,9 +58,7 @@ static int reiserfs_file_release (struct appended (we append by unformatted node only) or its direct item(s) had to be converted, then it may have to be indirect2direct converted */ - windex = push_journal_writer("file_release") ; reiserfs_truncate_file(inode, 0) ; - pop_journal_writer(windex) ; } up (&inode->i_sem); reiserfs_write_unlock(inode->i_sb); diff -puN fs/reiserfs/fix_node.c~reiserfs-journal-writer fs/reiserfs/fix_node.c --- 25/fs/reiserfs/fix_node.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/fix_node.c Wed Mar 24 15:14:32 2004 @@ -2280,7 +2280,6 @@ int fix_nodes (int n_op_mode, ** during wait_tb_buffers_run */ int wait_tb_buffers_run = 0 ; - int windex ; struct buffer_head * p_s_tbS0 = PATH_PLAST_BUFFER(p_s_tb->tb_path); ++ REISERFS_SB(p_s_tb -> tb_sb) -> s_fix_nodes; @@ -2407,10 +2406,7 @@ int fix_nodes (int n_op_mode, p_s_tb->insert_size[n_h + 1] = (DC_SIZE + KEY_SIZE) * (p_s_tb->blknum[n_h] - 1); } - - windex = push_journal_writer("fix_nodes") ; if ((n_ret_value = wait_tb_buffers_until_unlocked (p_s_tb)) == CARRY_ON) { - pop_journal_writer(windex) ; if (FILESYSTEM_CHANGED_TB(p_s_tb)) { wait_tb_buffers_run = 1 ; n_ret_value = REPEAT_SEARCH ; @@ -2420,7 +2416,6 @@ int fix_nodes (int n_op_mode, } } else { wait_tb_buffers_run = 1 ; - pop_journal_writer(windex) ; goto repeat; } diff -puN fs/reiserfs/inode.c~reiserfs-journal-writer fs/reiserfs/inode.c --- 25/fs/reiserfs/inode.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/inode.c Wed Mar 24 15:14:32 2004 @@ -29,9 +29,7 @@ static int reiserfs_get_block (struct in void reiserfs_delete_inode (struct inode * inode) { int jbegin_count = JOURNAL_PER_BALANCE_CNT * 2; - int windex ; struct reiserfs_transaction_handle th ; - reiserfs_write_lock(inode->i_sb); @@ -41,10 +39,8 @@ void reiserfs_delete_inode (struct inode journal_begin(&th, inode->i_sb, jbegin_count) ; reiserfs_update_inode_transaction(inode) ; - windex = push_journal_writer("delete_inode") ; reiserfs_delete_object (&th, inode); - pop_journal_writer(windex) ; journal_end(&th, inode->i_sb, jbegin_count) ; @@ -561,7 +557,6 @@ int reiserfs_get_block (struct inode * i __u32 * item; int done; int fs_gen; - int windex ; struct reiserfs_transaction_handle th ; /* space reserved in transaction batch: . 3 balancings in direct->indirect conversion @@ -607,8 +602,6 @@ int reiserfs_get_block (struct inode * i (have_small_tails (inode->i_sb) && inode->i_size < i_block_size(inode)) ) REISERFS_I(inode)->i_flags |= i_pack_on_close_mask ; - windex = push_journal_writer("reiserfs_get_block") ; - /* set the key of the first byte in the 'block'-th block of file */ make_cpu_key (&key, inode, new_offset, TYPE_ANY, 3/*key length*/); @@ -687,7 +680,6 @@ int reiserfs_get_block (struct inode * i } set_block_dev_mapped(bh_result, unfm_ptr, inode); pathrelse (&path); - pop_journal_writer(windex) ; if (transaction_started) journal_end(&th, inode->i_sb, jbegin_count) ; @@ -933,7 +925,6 @@ int reiserfs_get_block (struct inode * i reiserfs_update_sd(&th, inode) ; journal_end(&th, inode->i_sb, jbegin_count) ; } - pop_journal_writer(windex) ; reiserfs_write_unlock(inode->i_sb); reiserfs_check_path(&path) ; return retval; @@ -1836,7 +1827,6 @@ unlock: */ void reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) { struct reiserfs_transaction_handle th ; - int windex ; /* we want the offset for the first byte after the end of the file */ unsigned long offset = p_s_inode->i_size & (PAGE_CACHE_SIZE - 1) ; unsigned blocksize = p_s_inode->i_sb->s_blocksize ; @@ -1871,14 +1861,12 @@ void reiserfs_truncate_file(struct inode cut_from_item. 1 is for update_sd */ journal_begin(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1 ) ; reiserfs_update_inode_transaction(p_s_inode) ; - windex = push_journal_writer("reiserfs_vfs_truncate_file") ; if (update_timestamps) /* we are doing real truncate: if the system crashes before the last transaction of truncating gets committed - on reboot the file either appears truncated properly or not truncated at all */ add_save_link (&th, p_s_inode, 1); reiserfs_do_truncate (&th, p_s_inode, page, update_timestamps) ; - pop_journal_writer(windex) ; journal_end(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1 ) ; if (update_timestamps) diff -puN fs/reiserfs/journal.c~reiserfs-journal-writer fs/reiserfs/journal.c --- 25/fs/reiserfs/journal.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/journal.c Wed Mar 24 15:14:32 2004 @@ -408,7 +408,6 @@ void reiserfs_check_lock_depth(char *cal #ifdef CONFIG_SMP if (current->lock_depth < 0) { printk("%s called without kernel lock held\n", caller) ; - show_reiserfs_locks() ; BUG() ; } #else @@ -444,52 +443,6 @@ static inline struct reiserfs_journal_cn return cn ; } -/* once upon a time, the journal would deadlock. a lot. Now, when -** CONFIG_REISERFS_CHECK is defined, anytime someone enters a -** transaction, it pushes itself into this ugly static list, and pops -** itself off before calling journal_end. I made a SysRq key to dump -** the list, and tell me what the writers are when I'm deadlocked. */ - - /* are you depending on the compiler - to optimize this function away - everywhere it is called? It is not - obvious how this works, but I - suppose debugging code need not be - clear. -Hans */ -static char *journal_writers[512] ; -int push_journal_writer(char *s) { -#ifdef CONFIG_REISERFS_CHECK - int i ; - for (i = 0 ; i < 512 ; i++) { - if (!journal_writers[i]) { - journal_writers[i] = s ; - return i ; - } - } - return -1 ; -#else - return 0 ; -#endif -} -int pop_journal_writer(int index) { -#ifdef CONFIG_REISERFS_CHECK - if (index >= 0) { - journal_writers[index] = NULL ; - } -#endif - return 0 ; -} - -int dump_journal_writers(void) { - int i ; - for (i = 0 ; i < 512 ; i++) { - if (journal_writers[i]) { - printk("%d: %s\n", i, journal_writers[i]) ; - } - } - return 0 ; -} - /* ** this actually means 'can this block be reallocated yet?'. If you set search_all, a block can only be allocated ** if it is not in the current transaction, was not freed by the current transaction, and has no chance of ever @@ -2095,7 +2048,6 @@ int journal_init(struct super_block *p_s journal_list_init(p_s_sb) ; memset(SB_JOURNAL(p_s_sb)->j_list_hash_table, 0, JOURNAL_HASH_SIZE * sizeof(struct reiserfs_journal_cnode *)) ; - memset(journal_writers, 0, sizeof(char *) * 512) ; /* debug code */ INIT_LIST_HEAD(&SB_JOURNAL(p_s_sb)->j_dirty_buffers) ; spin_lock_init(&SB_JOURNAL(p_s_sb)->j_dirty_buffers_lock) ; @@ -2372,7 +2324,6 @@ int journal_mark_dirty(struct reiserfs_t buffer_locked(bh) ? ' ' : '!', buffer_dirty(bh) ? ' ' : '!', buffer_journal_dirty(bh) ? ' ' : '!') ; - show_reiserfs_locks() ; } count_already_incd = clear_prepared_bits(bh) ; @@ -2590,12 +2541,6 @@ int journal_end_sync(struct reiserfs_tra return do_journal_end(th, p_s_sb, nblocks, COMMIT_NOW | WAIT) ; } -int show_reiserfs_locks(void) { - - dump_journal_writers() ; - return 0 ; -} - /* ** used to get memory back from async commits that are floating around ** and to reclaim any blocks deleted but unusable because their commits diff -puN fs/reiserfs/namei.c~reiserfs-journal-writer fs/reiserfs/namei.c --- 25/fs/reiserfs/namei.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/namei.c Wed Mar 24 15:14:32 2004 @@ -737,7 +737,6 @@ static int reiserfs_rmdir (struct inode { int retval; struct inode * inode; - int windex ; struct reiserfs_transaction_handle th ; int jbegin_count; INITIALIZE_PATH (path); @@ -749,7 +748,6 @@ static int reiserfs_rmdir (struct inode reiserfs_write_lock(dir->i_sb); journal_begin(&th, dir->i_sb, jbegin_count) ; - windex = push_journal_writer("reiserfs_rmdir") ; de.de_gen_number_bit_string = 0; if ( (retval = reiserfs_find_entry (dir, dentry->d_name.name, dentry->d_name.len, &path, &de)) == NAME_NOT_FOUND) { @@ -798,7 +796,6 @@ static int reiserfs_rmdir (struct inode /* prevent empty directory from getting lost */ add_save_link (&th, inode, 0/* not truncate */); - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_check_path(&path) ; reiserfs_write_unlock(dir->i_sb); @@ -809,7 +806,6 @@ static int reiserfs_rmdir (struct inode reiserfs_cut_from_item, or reiserfs_cut_from_item does not release path if operation was not complete */ pathrelse (&path); - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_write_unlock(dir->i_sb); return retval; @@ -821,7 +817,6 @@ static int reiserfs_unlink (struct inode struct inode * inode; struct reiserfs_dir_entry de; INITIALIZE_PATH (path); - int windex ; struct reiserfs_transaction_handle th ; int jbegin_count; unsigned long savelink; @@ -834,7 +829,6 @@ static int reiserfs_unlink (struct inode reiserfs_write_lock(dir->i_sb); journal_begin(&th, dir->i_sb, jbegin_count) ; - windex = push_journal_writer("reiserfs_unlink") ; de.de_gen_number_bit_string = 0; if ( (retval = reiserfs_find_entry (dir, dentry->d_name.name, dentry->d_name.len, &path, &de)) == NAME_NOT_FOUND) { @@ -887,7 +881,6 @@ static int reiserfs_unlink (struct inode /* prevent file from getting lost */ add_save_link (&th, inode, 0/* not truncate */); - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_check_path(&path) ; reiserfs_write_unlock(dir->i_sb); @@ -895,7 +888,6 @@ static int reiserfs_unlink (struct inode end_unlink: pathrelse (&path); - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_check_path(&path) ; reiserfs_write_unlock(dir->i_sb); @@ -978,7 +970,6 @@ static int reiserfs_link (struct dentry { int retval; struct inode *inode = old_dentry->d_inode; - int windex ; struct reiserfs_transaction_handle th ; int jbegin_count = JOURNAL_PER_BALANCE_CNT * 3; @@ -996,7 +987,6 @@ static int reiserfs_link (struct dentry inode->i_nlink++; journal_begin(&th, dir->i_sb, jbegin_count) ; - windex = push_journal_writer("reiserfs_link") ; /* create new entry */ retval = reiserfs_add_entry (&th, dir, dentry->d_name.name, dentry->d_name.len, @@ -1007,7 +997,6 @@ static int reiserfs_link (struct dentry if (retval) { inode->i_nlink--; - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_write_unlock(dir->i_sb); return retval; @@ -1018,7 +1007,6 @@ static int reiserfs_link (struct dentry atomic_inc(&inode->i_count) ; d_instantiate(dentry, inode); - pop_journal_writer(windex) ; journal_end(&th, dir->i_sb, jbegin_count) ; reiserfs_write_unlock(dir->i_sb); return 0; @@ -1082,7 +1070,6 @@ static int reiserfs_rename (struct inode struct item_head new_entry_ih, old_entry_ih, dot_dot_ih ; struct reiserfs_dir_entry old_de, new_de, dot_dot_de; struct inode * old_inode, * new_dentry_inode; - int windex ; struct reiserfs_transaction_handle th ; int jbegin_count ; umode_t old_inode_mode; @@ -1150,7 +1137,6 @@ static int reiserfs_rename (struct inode } journal_begin(&th, old_dir->i_sb, jbegin_count) ; - windex = push_journal_writer("reiserfs_rename") ; /* add new entry (or find the existing one) */ retval = reiserfs_add_entry (&th, new_dir, new_dentry->d_name.name, new_dentry->d_name.len, @@ -1161,7 +1147,6 @@ static int reiserfs_rename (struct inode "vs-7050: new entry is found, new inode == 0\n"); } } else if (retval) { - pop_journal_writer(windex) ; journal_end(&th, old_dir->i_sb, jbegin_count) ; reiserfs_write_unlock(old_dir->i_sb); return retval; @@ -1314,14 +1299,11 @@ static int reiserfs_rename (struct inode reiserfs_update_sd (&th, new_dentry_inode); } - pop_journal_writer(windex) ; journal_end(&th, old_dir->i_sb, jbegin_count) ; reiserfs_write_unlock(old_dir->i_sb); return 0; } - - /* * directories can handle most operations... */ diff -puN fs/reiserfs/prints.c~reiserfs-journal-writer fs/reiserfs/prints.c --- 25/fs/reiserfs/prints.c~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/fs/reiserfs/prints.c Wed Mar 24 15:14:32 2004 @@ -333,7 +333,6 @@ extern struct tree_balance * cur_tb; void reiserfs_panic (struct super_block * sb, const char * fmt, ...) { - show_reiserfs_locks() ; do_reiserfs_warning(fmt); printk ( KERN_EMERG "%s", error_buf); BUG (); diff -puN include/linux/reiserfs_fs.h~reiserfs-journal-writer include/linux/reiserfs_fs.h --- 25/include/linux/reiserfs_fs.h~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/include/linux/reiserfs_fs.h Wed Mar 24 15:14:32 2004 @@ -1727,8 +1727,6 @@ int journal_end(struct reiserfs_transact int journal_end_sync(struct reiserfs_transaction_handle *, struct super_block *, unsigned long) ; int journal_mark_dirty_nolog(struct reiserfs_transaction_handle *, struct super_block *, struct buffer_head *bh) ; int journal_mark_freed(struct reiserfs_transaction_handle *, struct super_block *, b_blocknr_t blocknr) ; -int push_journal_writer(char *w) ; -int pop_journal_writer(int windex) ; int journal_transaction_should_end(struct reiserfs_transaction_handle *, int) ; int reiserfs_in_journal(struct super_block *p_s_sb, 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) ; diff -puN include/linux/reiserfs_fs_sb.h~reiserfs-journal-writer include/linux/reiserfs_fs_sb.h --- 25/include/linux/reiserfs_fs_sb.h~reiserfs-journal-writer Wed Mar 24 15:14:32 2004 +++ 25-akpm/include/linux/reiserfs_fs_sb.h Wed Mar 24 15:14:32 2004 @@ -475,7 +475,6 @@ void reiserfs_file_buffer (struct buffer extern struct file_system_type reiserfs_fs_type; int journal_mark_dirty(struct reiserfs_transaction_handle *, struct super_block *, struct buffer_head *bh) ; int flush_old_commits(struct super_block *s, int) ; -int show_reiserfs_locks(void) ; int reiserfs_resize(struct super_block *, unsigned long) ; #define CARRY_ON 0 _