Skip to contentSkip to conversation

fs/hfsplus/: move the hfsplus_inode_check() prototype to hfsplus_fs.h

PATCH In review Adrian Bunk 2 participants 3 messages Dec 13, 2005 – Dec 15, 2005 Hfsplus filesystem

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 fs/hfsplus/: move the hfsplus_inode_check() prototype to hfsplus_fs.h

Function prototypes belong into header files.

Signed-off-by Adrian Bunk <[email protected]>

---

This patch was already sent on:
- 23 Nov 2005

 fs/hfsplus/hfsplus_fs.h |    3 +++
 fs/hfsplus/inode.c      |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
fs/hfsplus/hfsplus_fs.h renamed from fs/hfsplus/hfsplus_fs.h.old +3 -0
@@ -347,6 +347,9 @@
 void hfsplus_fill_defaults(struct hfsplus_sb_info *);
 int hfsplus_show_options(struct seq_file *, struct vfsmount *);
 
+/* super.c */
+void hfsplus_inode_check(struct super_block *sb);
+
 /* tables.c */
 extern u16 hfsplus_case_fold_table[];
 extern u16 hfsplus_decompose_table[];
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -2
@@ -183,7 +183,6 @@
 	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);
 	}

@@ -322,7 +321,6 @@
 		return NULL;
 
 	{
-	void hfsplus_inode_check(struct super_block *sb);
 	atomic_inc(&HFSPLUS_SB(sb).inode_cnt);
 	hfsplus_inode_check(sb);
 	}
#1 lore raw

Hi,

Quoted 11 lines · Adrian Bunk
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -1
@@ -183,7 +183,6 @@
 	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);
 	}

fs/hfsplus/inode.c line 326

Quoted 7 lines
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -1
@@ -322,7 +321,6 @@
 		return NULL;
 
 	{
-	void hfsplus_inode_check(struct super_block *sb);
 	atomic_inc(&HFSPLUS_SB(sb).inode_cnt);
 	hfsplus_inode_check(sb);
 	}

As this is only a debug function I don't see much point in cleaning it up. I'd rather remove it completely (including all references to last_inode_cnt and inode_cnt).

bye, Roman

author
#2 lore raw

PATCH 1/1 fs/hfsplus/: remove the hfsplus_inode_check() debug function

Quoted 1 line · Roman Zippel

Hi,

Hi Roman,

Quoted 15 lines · Adrian Bunk
Quoted 14 lines
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -1
@@ -183,7 +183,6 @@
 	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);
 	}

@@ -322,7 +321,6 @@
 		return NULL;
Quoted 9 lines

fs/hfsplus/inode.c line 326

Quoted 5 lines
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -1
 	{
-	void hfsplus_inode_check(struct super_block *sb);
 	atomic_inc(&HFSPLUS_SB(sb).inode_cnt);
 	hfsplus_inode_check(sb);
 	}

As this is only a debug function I don't see much point in cleaning it up. I'd rather remove it completely (including all references to last_inode_cnt and inode_cnt).

patch below.

Quoted 1 line

bye, Roman

cu
Adrian

<-- snip -->

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 <[email protected]>

---

 fs/hfsplus/hfsplus_fs.h |    3 ---
 fs/hfsplus/inode.c      |   10 ----------
 fs/hfsplus/super.c      |   19 -------------------
 3 files changed, 32 deletions(-)
fs/hfsplus/hfsplus_fs.h renamed from fs/hfsplus/hfsplus_fs.h.old +0 -3
@@ -143,9 +143,6 @@
 
 	unsigned long flags;
 
-	atomic_t inode_cnt;
-	u32 last_inode_cnt;
-
 	struct hlist_head rsrc_inodes;
 };
fs/hfsplus/inode.c renamed from fs/hfsplus/inode.c.old +0 -10
@@ -182,11 +182,6 @@
 	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 @@
 	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;
fs/hfsplus/super.c renamed from fs/hfsplus/super.c.old +0 -19
@@ -22,29 +22,12 @@
 
 #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 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)