[XFS] kill deleted inodes list
Now that the deleted inodes list is unused, kill it. This also removes the i_reclaim list head from the xfs_inode, shrinking it by two pointers. SGI-PV: 988142 SGI-Modid: xfs-linux-melb:xfs-kern:32334a Signed-off-by: David Chinner <david@fromorbit.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: Christoph Hellwig <hch@infradead.org>
This commit is contained in:
committed by
Lachlan McIlroy
parent
7a3be02bae
commit
116545130c
@@ -913,7 +913,6 @@ xfs_fs_inode_init_once(
|
|||||||
atomic_set(&ip->i_iocount, 0);
|
atomic_set(&ip->i_iocount, 0);
|
||||||
atomic_set(&ip->i_pincount, 0);
|
atomic_set(&ip->i_pincount, 0);
|
||||||
spin_lock_init(&ip->i_flags_lock);
|
spin_lock_init(&ip->i_flags_lock);
|
||||||
INIT_LIST_HEAD(&ip->i_reclaim);
|
|
||||||
init_waitqueue_head(&ip->i_ipin_wait);
|
init_waitqueue_head(&ip->i_ipin_wait);
|
||||||
/*
|
/*
|
||||||
* Because we want to use a counting completion, complete
|
* Because we want to use a counting completion, complete
|
||||||
@@ -1546,7 +1545,6 @@ xfs_fs_fill_super(
|
|||||||
goto out_free_args;
|
goto out_free_args;
|
||||||
|
|
||||||
spin_lock_init(&mp->m_sb_lock);
|
spin_lock_init(&mp->m_sb_lock);
|
||||||
mutex_init(&mp->m_ilock);
|
|
||||||
mutex_init(&mp->m_growlock);
|
mutex_init(&mp->m_growlock);
|
||||||
atomic_set(&mp->m_active_trans, 0);
|
atomic_set(&mp->m_active_trans, 0);
|
||||||
INIT_LIST_HEAD(&mp->m_sync_list);
|
INIT_LIST_HEAD(&mp->m_sync_list);
|
||||||
|
@@ -644,6 +644,11 @@ xfs_reclaim_inode(
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We set the inode flag atomically with the radix tree tag.
|
||||||
|
* Once we get tag lookups on the radix tree, this inode flag
|
||||||
|
* can go away.
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
xfs_inode_set_reclaim_tag(
|
xfs_inode_set_reclaim_tag(
|
||||||
xfs_inode_t *ip)
|
xfs_inode_t *ip)
|
||||||
@@ -655,6 +660,7 @@ xfs_inode_set_reclaim_tag(
|
|||||||
spin_lock(&ip->i_flags_lock);
|
spin_lock(&ip->i_flags_lock);
|
||||||
radix_tree_tag_set(&pag->pag_ici_root,
|
radix_tree_tag_set(&pag->pag_ici_root,
|
||||||
XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
|
XFS_INO_TO_AGINO(mp, ip->i_ino), XFS_ICI_RECLAIM_TAG);
|
||||||
|
__xfs_iflags_set(ip, XFS_IRECLAIMABLE);
|
||||||
spin_unlock(&ip->i_flags_lock);
|
spin_unlock(&ip->i_flags_lock);
|
||||||
read_unlock(&pag->pag_ici_lock);
|
read_unlock(&pag->pag_ici_lock);
|
||||||
xfs_put_perag(mp, pag);
|
xfs_put_perag(mp, pag);
|
||||||
|
@@ -95,10 +95,6 @@ xfs_iget_cache_hit(
|
|||||||
/* clear the radix tree reclaim flag as well. */
|
/* clear the radix tree reclaim flag as well. */
|
||||||
__xfs_inode_clear_reclaim_tag(mp, pag, ip);
|
__xfs_inode_clear_reclaim_tag(mp, pag, ip);
|
||||||
read_unlock(&pag->pag_ici_lock);
|
read_unlock(&pag->pag_ici_lock);
|
||||||
|
|
||||||
XFS_MOUNT_ILOCK(mp);
|
|
||||||
list_del_init(&ip->i_reclaim);
|
|
||||||
XFS_MOUNT_IUNLOCK(mp);
|
|
||||||
} else if (!igrab(VFS_I(ip))) {
|
} else if (!igrab(VFS_I(ip))) {
|
||||||
/* If the VFS inode is being torn down, pause and try again. */
|
/* If the VFS inode is being torn down, pause and try again. */
|
||||||
error = EAGAIN;
|
error = EAGAIN;
|
||||||
@@ -419,11 +415,7 @@ xfs_iextract(
|
|||||||
write_unlock(&pag->pag_ici_lock);
|
write_unlock(&pag->pag_ici_lock);
|
||||||
xfs_put_perag(mp, pag);
|
xfs_put_perag(mp, pag);
|
||||||
|
|
||||||
/* Deal with the deleted inodes list */
|
|
||||||
XFS_MOUNT_ILOCK(mp);
|
|
||||||
list_del_init(&ip->i_reclaim);
|
|
||||||
mp->m_ireclaims++;
|
mp->m_ireclaims++;
|
||||||
XFS_MOUNT_IUNLOCK(mp);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -811,7 +811,7 @@ xfs_inode_alloc(
|
|||||||
ASSERT(atomic_read(&ip->i_iocount) == 0);
|
ASSERT(atomic_read(&ip->i_iocount) == 0);
|
||||||
ASSERT(atomic_read(&ip->i_pincount) == 0);
|
ASSERT(atomic_read(&ip->i_pincount) == 0);
|
||||||
ASSERT(!spin_is_locked(&ip->i_flags_lock));
|
ASSERT(!spin_is_locked(&ip->i_flags_lock));
|
||||||
ASSERT(list_empty(&ip->i_reclaim));
|
ASSERT(completion_done(&ip->i_flush));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* initialise the VFS inode here to get failures
|
* initialise the VFS inode here to get failures
|
||||||
@@ -2729,7 +2729,7 @@ xfs_idestroy(
|
|||||||
ASSERT(atomic_read(&ip->i_iocount) == 0);
|
ASSERT(atomic_read(&ip->i_iocount) == 0);
|
||||||
ASSERT(atomic_read(&ip->i_pincount) == 0);
|
ASSERT(atomic_read(&ip->i_pincount) == 0);
|
||||||
ASSERT(!spin_is_locked(&ip->i_flags_lock));
|
ASSERT(!spin_is_locked(&ip->i_flags_lock));
|
||||||
ASSERT(list_empty(&ip->i_reclaim));
|
ASSERT(completion_done(&ip->i_flush));
|
||||||
kmem_zone_free(xfs_inode_zone, ip);
|
kmem_zone_free(xfs_inode_zone, ip);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -235,7 +235,6 @@ typedef struct dm_attrs_s {
|
|||||||
typedef struct xfs_inode {
|
typedef struct xfs_inode {
|
||||||
/* Inode linking and identification information. */
|
/* Inode linking and identification information. */
|
||||||
struct xfs_mount *i_mount; /* fs mount struct ptr */
|
struct xfs_mount *i_mount; /* fs mount struct ptr */
|
||||||
struct list_head i_reclaim; /* reclaim list */
|
|
||||||
struct xfs_dquot *i_udquot; /* user dquot */
|
struct xfs_dquot *i_udquot; /* user dquot */
|
||||||
struct xfs_dquot *i_gdquot; /* group dquot */
|
struct xfs_dquot *i_gdquot; /* group dquot */
|
||||||
|
|
||||||
|
@@ -580,7 +580,6 @@ xfs_mount_common(xfs_mount_t *mp, xfs_sb_t *sbp)
|
|||||||
mp->m_blockmask = sbp->sb_blocksize - 1;
|
mp->m_blockmask = sbp->sb_blocksize - 1;
|
||||||
mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG;
|
mp->m_blockwsize = sbp->sb_blocksize >> XFS_WORDLOG;
|
||||||
mp->m_blockwmask = mp->m_blockwsize - 1;
|
mp->m_blockwmask = mp->m_blockwsize - 1;
|
||||||
INIT_LIST_HEAD(&mp->m_del_inodes);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Setup for attributes, in case they get created.
|
* Setup for attributes, in case they get created.
|
||||||
|
@@ -248,8 +248,6 @@ typedef struct xfs_mount {
|
|||||||
xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */
|
xfs_agnumber_t m_agirotor; /* last ag dir inode alloced */
|
||||||
spinlock_t m_agirotor_lock;/* .. and lock protecting it */
|
spinlock_t m_agirotor_lock;/* .. and lock protecting it */
|
||||||
xfs_agnumber_t m_maxagi; /* highest inode alloc group */
|
xfs_agnumber_t m_maxagi; /* highest inode alloc group */
|
||||||
struct list_head m_del_inodes; /* inodes to reclaim */
|
|
||||||
mutex_t m_ilock; /* inode list mutex */
|
|
||||||
uint m_ireclaims; /* count of calls to reclaim*/
|
uint m_ireclaims; /* count of calls to reclaim*/
|
||||||
uint m_readio_log; /* min read size log bytes */
|
uint m_readio_log; /* min read size log bytes */
|
||||||
uint m_readio_blocks; /* min read size blocks */
|
uint m_readio_blocks; /* min read size blocks */
|
||||||
@@ -312,8 +310,7 @@ typedef struct xfs_mount {
|
|||||||
int m_attr_magicpct;/* 37% of the blocksize */
|
int m_attr_magicpct;/* 37% of the blocksize */
|
||||||
int m_dir_magicpct; /* 37% of the dir blocksize */
|
int m_dir_magicpct; /* 37% of the dir blocksize */
|
||||||
__uint8_t m_mk_sharedro; /* mark shared ro on unmount */
|
__uint8_t m_mk_sharedro; /* mark shared ro on unmount */
|
||||||
__uint8_t m_inode_quiesce;/* call quiesce on new inodes.
|
__uint8_t m_inode_quiesce;/* call quiesce on new inodes. */
|
||||||
field governed by m_ilock */
|
|
||||||
__uint8_t m_sectbb_log; /* sectlog - BBSHIFT */
|
__uint8_t m_sectbb_log; /* sectlog - BBSHIFT */
|
||||||
const struct xfs_nameops *m_dirnameops; /* vector of dir name ops */
|
const struct xfs_nameops *m_dirnameops; /* vector of dir name ops */
|
||||||
int m_dirblksize; /* directory block sz--bytes */
|
int m_dirblksize; /* directory block sz--bytes */
|
||||||
|
@@ -2835,18 +2835,8 @@ xfs_reclaim(
|
|||||||
xfs_iflock(ip);
|
xfs_iflock(ip);
|
||||||
xfs_iflags_set(ip, XFS_IRECLAIMABLE);
|
xfs_iflags_set(ip, XFS_IRECLAIMABLE);
|
||||||
return xfs_reclaim_inode(ip, 1, XFS_IFLUSH_DELWRI_ELSE_SYNC);
|
return xfs_reclaim_inode(ip, 1, XFS_IFLUSH_DELWRI_ELSE_SYNC);
|
||||||
} else {
|
|
||||||
xfs_mount_t *mp = ip->i_mount;
|
|
||||||
|
|
||||||
/* Protect sync and unpin from us */
|
|
||||||
XFS_MOUNT_ILOCK(mp);
|
|
||||||
spin_lock(&ip->i_flags_lock);
|
|
||||||
__xfs_iflags_set(ip, XFS_IRECLAIMABLE);
|
|
||||||
spin_unlock(&ip->i_flags_lock);
|
|
||||||
list_add_tail(&ip->i_reclaim, &mp->m_del_inodes);
|
|
||||||
XFS_MOUNT_IUNLOCK(mp);
|
|
||||||
xfs_inode_set_reclaim_tag(ip);
|
|
||||||
}
|
}
|
||||||
|
xfs_inode_set_reclaim_tag(ip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user