[XFS] use xfs_sync_inodes rather than xfs_syncsub
Kill the unused arg in xfs_syncsub() and xfs_sync_inodes(). For callers of
xfs_syncsub() that only want to flush inodes, replace xfs_syncsub() with
direct calls to xfs_sync_inodes() as that is all that is being done with
the specific flags being passed in.
SGI-PV: 988140
SGI-Modid: xfs-linux-melb:xfs-kern:32305a
Signed-off-by: David Chinner <david@fromorbit.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Christoph Hellwig <hch@infradead.org>
diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index 461c1dc..7e9fb52 100644
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -117,7 +117,7 @@
if (flags & SYNC_IOWAIT)
xfs_filestream_flush(mp);
- return xfs_syncsub(mp, flags, NULL);
+ return xfs_syncsub(mp, flags);
}
/*
@@ -128,8 +128,7 @@
xfs_sync_inodes_ag(
xfs_mount_t *mp,
int ag,
- int flags,
- int *bypassed)
+ int flags)
{
xfs_perag_t *pag = &mp->m_perag[ag];
int nr_found;
@@ -260,8 +259,6 @@
error = xfs_iflush(ip, XFS_IFLUSH_DELWRI);
else
xfs_ifunlock(ip);
- } else if (bypassed) {
- (*bypassed)++;
}
}
@@ -288,15 +285,12 @@
int
xfs_sync_inodes(
xfs_mount_t *mp,
- int flags,
- int *bypassed)
+ int flags)
{
int error;
int last_error;
int i;
- if (bypassed)
- *bypassed = 0;
if (mp->m_flags & XFS_MOUNT_RDONLY)
return 0;
error = 0;
@@ -305,7 +299,7 @@
for (i = 0; i < mp->m_sb.sb_agcount; i++) {
if (!mp->m_perag[i].pag_ici_init)
continue;
- error = xfs_sync_inodes_ag(mp, i, flags, bypassed);
+ error = xfs_sync_inodes_ag(mp, i, flags);
if (error)
last_error = error;
if (error == EFSCORRUPTED)
@@ -408,11 +402,10 @@
* interface as explained above under xfs_sync.
*
*/
-int
+STATIC int
xfs_syncsub(
xfs_mount_t *mp,
- int flags,
- int *bypassed)
+ int flags)
{
int error = 0;
int last_error = 0;
@@ -431,7 +424,7 @@
if (flags & SYNC_BDFLUSH)
xfs_finish_reclaim_all(mp, 1, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
else
- error = xfs_sync_inodes(mp, flags, bypassed);
+ error = xfs_sync_inodes(mp, flags);
}
/*
diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h
index 3746d15..2954861 100644
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
@@ -55,7 +55,7 @@
void xfs_syncd_stop(struct xfs_mount *mp);
int xfs_sync(struct xfs_mount *mp, int flags);
-int xfs_syncsub(struct xfs_mount *mp, int flags, int *bypassed);
+int xfs_sync_inodes(struct xfs_mount *mp, int flags);
void xfs_flush_inode(struct xfs_inode *ip);
void xfs_flush_device(struct xfs_inode *ip);