lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfs: factor out inode validation for sync

Browse Source 
Separate the validation of inodes found by the radix
tree walk from the radix tree lookup.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
This commit is contained in:
Dave Chinner
2009-06-08 15:35:07 +02:00
committed by Christoph Hellwig
parent 845b6d0cbb
commit 1da8eecab5
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
fs/xfs/linux-2.6/xfs_sync.c
View File

@@ -49,6 +49,39 @@
#include <linux/freezer.h> #include <linux/freezer.h>
/* must be called with pag_ici_lock held and releases it */
STATIC int
xfs_sync_inode_valid(
struct xfs_inode *ip,
struct xfs_perag *pag)
{
struct inode *inode = VFS_I(ip);
/* nothing to sync during shutdown */
if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
read_unlock(&pag->pag_ici_lock);
return EFSCORRUPTED;
}
/*
* If we can't get a reference on the inode, it must be in reclaim.
* Leave it for the reclaim code to flush. Also avoid inodes that
* haven't been fully initialised.
*/
if (!igrab(inode)) {
read_unlock(&pag->pag_ici_lock);
return ENOENT;
}
read_unlock(&pag->pag_ici_lock);
if (is_bad_inode(inode) || xfs_iflags_test(ip, XFS_INEW)) {
IRELE(ip);
return ENOENT;
}
return 0;
}
STATIC int STATIC int
xfs_sync_inode_data( xfs_sync_inode_data(
struct xfs_inode *ip, struct xfs_inode *ip,
@@ -123,7 +156,6 @@ xfs_sync_inodes_ag(
int last_error = 0; int last_error = 0;
do { do {
struct inode *inode;
xfs_inode_t *ip = NULL; xfs_inode_t *ip = NULL;
/* /*
@@ -152,27 +184,10 @@ xfs_sync_inodes_ag(
break; break;
} }
/* nothing to sync during shutdown */ error = xfs_sync_inode_valid(ip, pag);
if (XFS_FORCED_SHUTDOWN(mp)) { if (error) {
read_unlock(&pag->pag_ici_lock); if (error == EFSCORRUPTED)
return 0; return 0;
}
/*
* If we can't get a reference on the inode, it must be
* in reclaim. Leave it for the reclaim code to flush.
*/
inode = VFS_I(ip);
if (!igrab(inode)) {
read_unlock(&pag->pag_ici_lock);
continue;
}
read_unlock(&pag->pag_ici_lock);
/* avoid new or bad inodes */
if (is_bad_inode(inode) ||
xfs_iflags_test(ip, XFS_INEW)) {
IRELE(ip);
continue; continue;
} }