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

Commit adab0f67 authored by Chandra Seetharaman's avatar Chandra Seetharaman Committed by Alex Elder
Browse files

xfs: Remove the second parameter to xfs_sb_count() 



Remove the second parameter to xfs_sb_count() since all callers of
the function set them.

Also, fix the header comment regarding it being called periodically.

Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent d0f9e8fb

fs/xfs/linux-2.6/xfs_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ xfs_quiesce_attr( 
	WARN_ON(atomic_read(&mp->m_active_trans) != 0);



	/* Push the superblock and write an unmount record */

	error = xfs_log_sbcount(mp, 1);

	error = xfs_log_sbcount(mp);

	if (error)

		xfs_warn(mp, "xfs_attr_quiesce: failed to log sb changes. "

				"Frozen image may not be consistent.");

fs/xfs/xfs_mount.c

+5 −10
Original line number Diff line number Diff line
@@ -1521,7 +1521,7 @@ xfs_unmountfs( 
		xfs_warn(mp, "Unable to free reserved block pool. "

				"Freespace may not be correct on next mount.");



	error = xfs_log_sbcount(mp, 1);

	error = xfs_log_sbcount(mp);

	if (error)

		xfs_warn(mp, "Unable to update superblock counters. "

				"Freespace may not be correct on next mount.");
@@ -1557,18 +1557,14 @@ xfs_fs_writable(xfs_mount_t *mp) 
/*

 * xfs_log_sbcount

 *

 * Called either periodically to keep the on disk superblock values

 * roughly up to date or from unmount to make sure the values are

 * correct on a clean unmount.

 * Sync the superblock counters to disk.

 *

 * Note this code can be called during the process of freezing, so

 * we may need to use the transaction allocator which does not not

 * we may need to use the transaction allocator which does not

 * block when the transaction subsystem is in its frozen state.

 */

int

xfs_log_sbcount(

	xfs_mount_t	*mp,

	uint		sync)

xfs_log_sbcount(xfs_mount_t *mp)

{

	xfs_trans_t	*tp;

	int		error;
@@ -1594,7 +1590,6 @@ xfs_log_sbcount( 
	}



	xfs_mod_sb(tp, XFS_SB_IFREE | XFS_SB_ICOUNT | XFS_SB_FDBLOCKS);

	if (sync)

	xfs_trans_set_sync(tp);

	error = xfs_trans_commit(tp, 0);

	return error;

fs/xfs/xfs_mount.h

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ typedef struct xfs_mod_sb { 
	int64_t		msb_delta;	/* Change to make to specified field */

} xfs_mod_sb_t;



extern int	xfs_log_sbcount(xfs_mount_t *, uint);

extern int	xfs_log_sbcount(xfs_mount_t *);

extern __uint64_t xfs_default_resblks(xfs_mount_t *mp);

extern int	xfs_mountfs(xfs_mount_t *mp);