jfs: switch to ->free_inode() (b3b4a6e3) · Commits · 戴 / test

fs/jfs/inode.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include "jfs_extent.h"
		#include "jfs_unicode.h"
		#include "jfs_debug.h"
		#include "jfs_dmap.h"


		struct inode jfs_iget(struct super_block sb, unsigned long ino)
		@@ -150,6 +151,8 @@ int jfs_write_inode(struct inode inode, struct writeback_control wbc)

		void jfs_evict_inode(struct inode *inode)
		{
		struct jfs_inode_info *ji = JFS_IP(inode);

		jfs_info("In jfs_evict_inode, inode = 0x%p", inode);

		if (!inode->i_nlink && !is_bad_inode(inode)) {
		@@ -173,6 +176,16 @@ void jfs_evict_inode(struct inode *inode)
		}
		clear_inode(inode);
		dquot_drop(inode);

		BUG_ON(!list_empty(&ji->anon_inode_list));

		spin_lock_irq(&ji->ag_lock);
		if (ji->active_ag != -1) {
		struct bmap *bmap = JFS_SBI(inode->i_sb)->bmap;
		atomic_dec(&bmap->db_active[ji->active_ag]);
		ji->active_ag = -1;
		}
		spin_unlock_irq(&ji->ag_lock);
		}

		void jfs_dirty_inode(struct inode *inode, int flags)

+3 −21

Original line number	Diff line number	Diff line
		@@ -124,27 +124,9 @@ static struct inode jfs_alloc_inode(struct super_block sb)
		return &jfs_inode->vfs_inode;
		}

		static void jfs_i_callback(struct rcu_head *head)
		static void jfs_free_inode(struct inode *inode)
		{
		struct inode *inode = container_of(head, struct inode, i_rcu);
		struct jfs_inode_info *ji = JFS_IP(inode);
		kmem_cache_free(jfs_inode_cachep, ji);
		}

		static void jfs_destroy_inode(struct inode *inode)
		{
		struct jfs_inode_info *ji = JFS_IP(inode);

		BUG_ON(!list_empty(&ji->anon_inode_list));

		spin_lock_irq(&ji->ag_lock);
		if (ji->active_ag != -1) {
		struct bmap *bmap = JFS_SBI(inode->i_sb)->bmap;
		atomic_dec(&bmap->db_active[ji->active_ag]);
		ji->active_ag = -1;
		}
		spin_unlock_irq(&ji->ag_lock);
		call_rcu(&inode->i_rcu, jfs_i_callback);
		kmem_cache_free(jfs_inode_cachep, JFS_IP(inode));
		}

		static int jfs_statfs(struct dentry dentry, struct kstatfs buf)
		@@ -912,7 +894,7 @@ out:

		static const struct super_operations jfs_super_operations = {
		.alloc_inode = jfs_alloc_inode,
		.destroy_inode = jfs_destroy_inode,
		.free_inode = jfs_free_inode,
		.dirty_inode = jfs_dirty_inode,
		.write_inode = jfs_write_inode,
		.evict_inode = jfs_evict_inode,