From: Adrian Bunk This patch removes the hfsplus_inode_check() debug function. It also removes the now obsolete last_inode_cnt and inode_cnt from struct hfsplus_sb_info. Signed-off-by: Adrian Bunk Cc: Roman Zippel Signed-off-by: Andrew Morton --- fs/hfsplus/hfsplus_fs.h | 3 --- fs/hfsplus/inode.c | 10 ---------- fs/hfsplus/super.c | 19 ------------------- 3 files changed, 32 deletions(-) diff -puN fs/hfsplus/hfsplus_fs.h~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function fs/hfsplus/hfsplus_fs.h --- devel/fs/hfsplus/hfsplus_fs.h~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function 2005-12-22 05:10:32.000000000 -0800 +++ devel-akpm/fs/hfsplus/hfsplus_fs.h 2005-12-22 05:10:32.000000000 -0800 @@ -143,9 +143,6 @@ struct hfsplus_sb_info { unsigned long flags; - atomic_t inode_cnt; - u32 last_inode_cnt; - struct hlist_head rsrc_inodes; }; diff -puN fs/hfsplus/inode.c~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function fs/hfsplus/inode.c --- devel/fs/hfsplus/inode.c~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function 2005-12-22 05:10:32.000000000 -0800 +++ devel-akpm/fs/hfsplus/inode.c 2005-12-22 05:10:32.000000000 -0800 @@ -182,11 +182,6 @@ static struct dentry *hfsplus_file_looku igrab(dir); hlist_add_head(&inode->i_hash, &HFSPLUS_SB(sb).rsrc_inodes); mark_inode_dirty(inode); - { - void hfsplus_inode_check(struct super_block *sb); - atomic_inc(&HFSPLUS_SB(sb).inode_cnt); - hfsplus_inode_check(sb); - } out: d_add(dentry, inode); return NULL; @@ -321,11 +316,6 @@ struct inode *hfsplus_new_inode(struct s if (!inode) return NULL; - { - void hfsplus_inode_check(struct super_block *sb); - atomic_inc(&HFSPLUS_SB(sb).inode_cnt); - hfsplus_inode_check(sb); - } inode->i_ino = HFSPLUS_SB(sb).next_cnid++; inode->i_mode = mode; inode->i_uid = current->fsuid; diff -puN fs/hfsplus/super.c~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function fs/hfsplus/super.c --- devel/fs/hfsplus/super.c~fs-hfsplus-remove-the-hfsplus_inode_check-debug-function 2005-12-22 05:10:32.000000000 -0800 +++ devel-akpm/fs/hfsplus/super.c 2005-12-22 05:10:32.000000000 -0800 @@ -22,29 +22,12 @@ static void hfsplus_destroy_inode(struct #include "hfsplus_fs.h" -void hfsplus_inode_check(struct super_block *sb) -{ -#if 0 - u32 cnt = atomic_read(&HFSPLUS_SB(sb).inode_cnt); - u32 last_cnt = HFSPLUS_SB(sb).last_inode_cnt; - - if (cnt <= (last_cnt / 2) || - cnt >= (last_cnt * 2)) { - HFSPLUS_SB(sb).last_inode_cnt = cnt; - printk("inode_check: %u,%u,%u\n", cnt, last_cnt, - HFSPLUS_SB(sb).cat_tree ? HFSPLUS_SB(sb).cat_tree->node_hash_cnt : 0); - } -#endif -} - static void hfsplus_read_inode(struct inode *inode) { struct hfs_find_data fd; struct hfsplus_vh *vhdr; int err; - atomic_inc(&HFSPLUS_SB(inode->i_sb).inode_cnt); - hfsplus_inode_check(inode->i_sb); INIT_LIST_HEAD(&HFSPLUS_I(inode).open_dir_list); init_MUTEX(&HFSPLUS_I(inode).extents_lock); HFSPLUS_I(inode).flags = 0; @@ -155,12 +138,10 @@ static int hfsplus_write_inode(struct in static void hfsplus_clear_inode(struct inode *inode) { dprint(DBG_INODE, "hfsplus_clear_inode: %lu\n", inode->i_ino); - atomic_dec(&HFSPLUS_SB(inode->i_sb).inode_cnt); if (HFSPLUS_IS_RSRC(inode)) { HFSPLUS_I(HFSPLUS_I(inode).rsrc_inode).rsrc_inode = NULL; iput(HFSPLUS_I(inode).rsrc_inode); } - hfsplus_inode_check(inode->i_sb); } static void hfsplus_write_super(struct super_block *sb) _