joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-11-27 14:11:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[XFS] Use xfs_inode_clean() in more places

Browse Source 
Remove open coded checks for the whether the inode is clean and replace
them with an inlined function.

SGI-PV: 977461
SGI-Modid: xfs-linux-melb:xfs-kern:30503a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
David Chinner 2008-03-06 13:43:59 +11:00 committed by Lachlan McIlroy
parent bad5584332
commit 3354040897
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/xfs/xfs_inode.c
View File

@ -2118,13 +2118,6 @@ xfs_iunlink_remove(
return 0;
}
STATIC_INLINE int xfs_inode_clean(xfs_inode_t *ip)
{
return (((ip->i_itemp == NULL) ||
!(ip->i_itemp->ili_format.ilf_fields & XFS_ILOG_ALL)) &&
(ip->i_update_core == 0));
}
STATIC void
xfs_ifree_cluster(
xfs_inode_t *free_ip,
@ -3004,7 +2997,6 @@ xfs_iflush_cluster(
int ilist_size;
xfs_inode_t **ilist;
xfs_inode_t *iq;
xfs_inode_log_item_t *iip;
int nr_found;
int clcount = 0;
int bufwasdelwri;
@ -3040,13 +3032,8 @@ xfs_iflush_cluster(
* is a candidate for flushing. These checks will be repeated
* later after the appropriate locks are acquired.
*/
iip = iq->i_itemp;
if ((iq->i_update_core == 0) &&
((iip == NULL) ||
!(iip->ili_format.ilf_fields & XFS_ILOG_ALL)) &&
xfs_ipincount(iq) == 0) {
if (xfs_inode_clean(iq) && xfs_ipincount(iq) == 0)
continue;
}
/*
* Try to get locks. If any are unavailable or it is pinned,
@ -3069,10 +3056,8 @@ xfs_iflush_cluster(
* arriving here means that this inode can be flushed. First
* re-check that it's dirty before flushing.
*/
iip = iq->i_itemp;
if ((iq->i_update_core != 0) || ((iip != NULL) &&
(iip->ili_format.ilf_fields & XFS_ILOG_ALL))) {
int error;
if (!xfs_inode_clean(iq)) {
int error;
error = xfs_iflush_int(iq, bp);
if (error) {
xfs_iunlock(iq, XFS_ILOCK_SHARED);
@ -3176,8 +3161,7 @@ xfs_iflush(
* If the inode isn't dirty, then just release the inode
* flush lock and do nothing.
*/
if ((ip->i_update_core == 0) &&
((iip == NULL) || !(iip->ili_format.ilf_fields & XFS_ILOG_ALL))) {
if (xfs_inode_clean(ip)) {
ASSERT((iip != NULL) ?
!(iip->ili_item.li_flags & XFS_LI_IN_AIL) : 1);
xfs_ifunlock(ip);
@ -3343,8 +3327,7 @@ xfs_iflush_int(
* If the inode isn't dirty, then just release the inode
* flush lock and do nothing.
*/
if ((ip->i_update_core == 0) &&
((iip == NULL) || !(iip->ili_format.ilf_fields & XFS_ILOG_ALL))) {
if (xfs_inode_clean(ip)) {
xfs_ifunlock(ip);
return 0;
}

8
fs/xfs/xfs_inode_item.h
View File

@ -168,6 +168,14 @@ static inline int xfs_ilog_fext(int w)
return (w == XFS_DATA_FORK ? XFS_ILOG_DEXT : XFS_ILOG_AEXT);
}
static inline int xfs_inode_clean(xfs_inode_t *ip)
{
return (!ip->i_itemp ||
!(ip->i_itemp->ili_format.ilf_fields & XFS_ILOG_ALL)) &&
!ip->i_update_core;
}
#ifdef __KERNEL__
extern void xfs_inode_item_init(struct xfs_inode *, struct xfs_mount *);

4
fs/xfs/xfs_vnodeops.c
View File

@ -3454,7 +3454,6 @@ xfs_inode_flush(
int flags)
{
xfs_mount_t *mp = ip->i_mount;
xfs_inode_log_item_t *iip = ip->i_itemp;
int error = 0;
if (XFS_FORCED_SHUTDOWN(mp))
@ -3464,8 +3463,7 @@ xfs_inode_flush(
* Bypass inodes which have already been cleaned by
* the inode flush clustering code inside xfs_iflush
*/
if ((ip->i_update_core == 0) &&
((iip == NULL) || !(iip->ili_format.ilf_fields & XFS_ILOG_ALL)))
if (xfs_inode_clean(ip))
return 0;
/*