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

Commit 1f9b3b64 authored by Lachlan McIlroy's avatar Lachlan McIlroy Committed by Tim Shimmin
Browse files

[XFS] remove unused xflags parameter from sync routines 



SGI-PV: 959137
SGI-Modid: xfs-linux-melb:xfs-kern:27710a

Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 1c91ad3a

fs/xfs/quota/xfs_qm_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ xfs_qm_quotactl( 
		break;



	case Q_XQUOTASYNC:

		return (xfs_sync_inodes(mp, SYNC_DELWRI, 0, NULL));

		return (xfs_sync_inodes(mp, SYNC_DELWRI, NULL));



	default:

		break;

fs/xfs/xfs_mount.h

+2 −2
Original line number Diff line number Diff line
@@ -616,8 +616,8 @@ extern struct xfs_buf *xfs_getsb(xfs_mount_t *, int); 
extern int	xfs_readsb(xfs_mount_t *, int);

extern void	xfs_freesb(xfs_mount_t *);

extern void	xfs_do_force_shutdown(bhv_desc_t *, int, char *, int);

extern int	xfs_syncsub(xfs_mount_t *, int, int, int *);

extern int	xfs_sync_inodes(xfs_mount_t *, int, int, int *);

extern int	xfs_syncsub(xfs_mount_t *, int, int *);

extern int	xfs_sync_inodes(xfs_mount_t *, int, int *);

extern xfs_agnumber_t	xfs_initialize_perag(struct bhv_vfs *, xfs_mount_t *,

						xfs_agnumber_t);

extern void	xfs_xlatesb(void *, struct xfs_sb *, int, __int64_t);

fs/xfs/xfs_vfsops.c

+5 −13
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ xfs_quiesce_fs( 
	 * we can write the unmount record.

	 */

	do {

		xfs_syncsub(mp, SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT, 0, NULL);

		xfs_syncsub(mp, SYNC_REMOUNT|SYNC_ATTR|SYNC_WAIT, NULL);

		pincount = xfs_flush_buftarg(mp->m_ddev_targp, 1);

		if (!pincount) {

			delay(50);
@@ -886,24 +886,20 @@ xfs_sync( 
	if (unlikely(flags == SYNC_QUIESCE))

		return xfs_quiesce_fs(mp);

	else

		return xfs_syncsub(mp, flags, 0, NULL);

		return xfs_syncsub(mp, flags, NULL);

}



/*

 * xfs sync routine for internal use

 *

 * This routine supports all of the flags defined for the generic vfs_sync

 * interface as explained above under xfs_sync.  In the interests of not

 * changing interfaces within the 6.5 family, additional internally-

 * required functions are specified within a separate xflags parameter,

 * only available by calling this routine.

 * interface as explained above under xfs_sync.

 *

 */

int

xfs_sync_inodes(

	xfs_mount_t	*mp,

	int		flags,

	int             xflags,

	int             *bypassed)

{

	xfs_inode_t	*ip = NULL;
@@ -1412,17 +1408,13 @@ xfs_sync_inodes( 
 * xfs sync routine for internal use

 *

 * This routine supports all of the flags defined for the generic vfs_sync

 * interface as explained above under xfs_sync.  In the interests of not

 * changing interfaces within the 6.5 family, additional internally-

 * required functions are specified within a separate xflags parameter,

 * only available by calling this routine.

 * interface as explained above under xfs_sync.

 *

 */

int

xfs_syncsub(

	xfs_mount_t	*mp,

	int		flags,

	int             xflags,

	int             *bypassed)

{

	int		error = 0;
@@ -1444,7 +1436,7 @@ xfs_syncsub( 
		if (flags & SYNC_BDFLUSH)

			xfs_finish_reclaim_all(mp, 1);

		else

			error = xfs_sync_inodes(mp, flags, xflags, bypassed);

			error = xfs_sync_inodes(mp, flags, bypassed);

	}



	/*