xfs: remove unused parameter from xfs_reclaim_inodes

The noblock parameter of xfs_reclaim_inodes is only ever set to zero. Remove
it and all the conditional code that is never executed.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/fs/xfs/linux-2.6/xfs_sync.c b/fs/xfs/linux-2.6/xfs_sync.c
index c91d5b2a568e684658ba7a355f93fbbe35da5495..7eb9d9cca52a26ad4088a08cb06478f5fa772f42 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_sync.c
+++ b/fs/xfs/linux-2.6/xfs_sync.c
@@ -385,7 +385,7 @@ xfs_quiesce_fs(
        int     count = 0, pincount;
 
        xfs_flush_buftarg(mp->m_ddev_targp, 0);
-       xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
+       xfs_reclaim_inodes(mp, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
 
        /*
         * This loop must run at least twice.  The first instance of the loop
@@ -509,7 +509,7 @@ xfs_sync_worker(
 
        if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {
                xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);
-               xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
+               xfs_reclaim_inodes(mp, XFS_IFLUSH_DELWRI_ELSE_ASYNC);
                /* dgc: errors ignored here */
                error = xfs_qm_sync(mp, SYNC_BDFLUSH);
                error = xfs_sync_fsdata(mp, SYNC_BDFLUSH);
@@ -703,7 +703,6 @@ STATIC void
 xfs_reclaim_inodes_ag(
        xfs_mount_t     *mp,
        int             ag,
-       int             noblock,
        int             mode)
 {
        xfs_inode_t     *ip = NULL;
@@ -749,25 +748,13 @@ restart:
                        continue;
                }
 
-               if (noblock) {
-                       if (!xfs_ilock_nowait(ip, XFS_ILOCK_EXCL)) {
-                               read_unlock(&pag->pag_ici_lock);
-                               continue;
-                       }
-                       if (xfs_ipincount(ip) ||
-                           !xfs_iflock_nowait(ip)) {
-                               xfs_iunlock(ip, XFS_ILOCK_EXCL);
-                               read_unlock(&pag->pag_ici_lock);
-                               continue;
-                       }
-               }
                read_unlock(&pag->pag_ici_lock);
 
                /*
                 * hmmm - this is an inode already in reclaim. Do
                 * we even bother catching it here?
                 */
-               if (xfs_reclaim_inode(ip, noblock, mode))
+               if (xfs_reclaim_inode(ip, 0, mode))
                        skipped++;
        } while (nr_found);
 
@@ -782,7 +769,6 @@ restart:
 int
 xfs_reclaim_inodes(
        xfs_mount_t     *mp,
-       int              noblock,
        int             mode)
 {
        int             i;
@@ -790,7 +776,7 @@ xfs_reclaim_inodes(
        for (i = 0; i < mp->m_sb.sb_agcount; i++) {
                if (!mp->m_perag[i].pag_ici_init)
                        continue;
-               xfs_reclaim_inodes_ag(mp, i, noblock, mode);
+               xfs_reclaim_inodes_ag(mp, i, mode);
        }
        return 0;
 }

diff --git a/fs/xfs/linux-2.6/xfs_sync.h b/fs/xfs/linux-2.6/xfs_sync.h
index 308d5bf6dfbda281376be436cfd0434085ccdaec..d7b2b5f1c387dd8d308700bebf9beb6cac3f63f9 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_sync.h
+++ b/fs/xfs/linux-2.6/xfs_sync.h
@@ -48,7 +48,7 @@ void xfs_quiesce_attr(struct xfs_mount *mp);
 void xfs_flush_inodes(struct xfs_inode *ip);
 
 int xfs_reclaim_inode(struct xfs_inode *ip, int locked, int sync_mode);
-int xfs_reclaim_inodes(struct xfs_mount *mp, int noblock, int mode);
+int xfs_reclaim_inodes(struct xfs_mount *mp, int mode);
 
 void xfs_inode_set_reclaim_tag(struct xfs_inode *ip);
 void xfs_inode_clear_reclaim_tag(struct xfs_inode *ip);

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index b659db5e7165b3f5ddcc3ad9ea5e2f789d3b125d..5c6f092659c1cfb3f0edef669a197d10a955b34d 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1371,7 +1371,7 @@ xfs_unmountfs(
         * need to force the log first.
         */
        xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC);
-       xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_ASYNC);
+       xfs_reclaim_inodes(mp, XFS_IFLUSH_ASYNC);
 
        xfs_qm_unmount(mp);