Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc3318a authored by David Chinner's avatar David Chinner Committed by Lachlan McIlroy
Browse files

[XFS] rename inode reclaim functions 



The function names xfs_finish_reclaim and xfs_finish_reclaim_all are not
very descriptive of what they are reclaiming. Rename to
xfs_reclaim_inode[s] to match the xfs_sync_inodes() function.

SGI-PV: 988142

SGI-Modid: xfs-linux-melb:xfs-kern:32330a

Signed-off-by: default avatarDavid Chinner <david@fromorbit.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@infradead.org>
parent fce08f2f

fs/xfs/linux-2.6/xfs_sync.c

+5 −5
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ xfs_quiesce_fs( 
	int	count = 0, pincount;



	xfs_flush_buftarg(mp->m_ddev_targp, 0);

	xfs_finish_reclaim_all(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

	xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);



	/*

	 * This loop must run at least twice.  The first instance of the loop
@@ -505,7 +505,7 @@ xfs_sync_worker( 


	if (!(mp->m_flags & XFS_MOUNT_RDONLY)) {

		xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE);

		xfs_finish_reclaim_all(mp, 1, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

		xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_DELWRI_ELSE_ASYNC);

		/* dgc: errors ignored here */

		error = XFS_QM_DQSYNC(mp, SYNC_BDFLUSH);

		error = xfs_sync_fsdata(mp, SYNC_BDFLUSH);
@@ -584,7 +584,7 @@ xfs_syncd_stop( 
}



int

xfs_finish_reclaim(

xfs_reclaim_inode(

	xfs_inode_t	*ip,

	int		locked,

	int		sync_mode)
@@ -645,7 +645,7 @@ xfs_finish_reclaim( 
}



int

xfs_finish_reclaim_all(

xfs_reclaim_inodes(

	xfs_mount_t	*mp,

	int		 noblock,

	int		mode)
@@ -665,7 +665,7 @@ xfs_finish_reclaim_all( 
			}

		}

		XFS_MOUNT_IUNLOCK(mp);

		if (xfs_finish_reclaim(ip, noblock, mode))

		if (xfs_reclaim_inode(ip, noblock, mode))

			delay(1);

		goto restart;

	}

fs/xfs/linux-2.6/xfs_sync.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void xfs_quiesce_attr(struct xfs_mount *mp); 
void xfs_flush_inode(struct xfs_inode *ip);

void xfs_flush_device(struct xfs_inode *ip);



int xfs_finish_reclaim(struct xfs_inode *ip, int locked, int sync_mode);

int xfs_finish_reclaim_all(struct xfs_mount *mp, int noblock, int mode);

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);



#endif

fs/xfs/xfs_mount.c

+1 −1
Original line number Diff line number Diff line
@@ -1235,7 +1235,7 @@ xfs_unmountfs( 
	 * need to force the log first.

	 */

	xfs_log_force(mp, (xfs_lsn_t)0, XFS_LOG_FORCE | XFS_LOG_SYNC);

	xfs_finish_reclaim_all(mp, 0, XFS_IFLUSH_ASYNC);

	xfs_reclaim_inodes(mp, 0, XFS_IFLUSH_ASYNC);



	XFS_QM_DQPURGEALL(mp, XFS_QMOPT_QUOTALL | XFS_QMOPT_UMOUNTING);

fs/xfs/xfs_vnodeops.c

+1 −1
Original line number Diff line number Diff line
@@ -2834,7 +2834,7 @@ xfs_reclaim( 
		xfs_ilock(ip, XFS_ILOCK_EXCL);

		xfs_iflock(ip);

		xfs_iflags_set(ip, XFS_IRECLAIMABLE);

		return xfs_finish_reclaim(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;