Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xfs: Remove the second parameter to xfs_sb_count()

Browse source 
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: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Chandra Seetharaman 2011-06-29 22:10:14 +00:00 • committed by Alex Elder
parent d0f9e8fb4c
commit adab0f67d1
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/xfs/linux-2.6/xfs_sync.c
View file

@ -434,7 +434,7 @@ xfs_quiesce_attr(
WARN_ON(atomic_read(&mp->m_active_trans) != 0); WARN_ON(atomic_read(&mp->m_active_trans) != 0);
/* Push the superblock and write an unmount record */ /* Push the superblock and write an unmount record */
error = xfs_log_sbcount(mp, 1); error = xfs_log_sbcount(mp);
if (error) if (error)
xfs_warn(mp, "xfs_attr_quiesce: failed to log sb changes. " xfs_warn(mp, "xfs_attr_quiesce: failed to log sb changes. "
"Frozen image may not be consistent."); "Frozen image may not be consistent.");

15
fs/xfs/xfs_mount.c
View file

@ -1521,7 +1521,7 @@ xfs_unmountfs(
xfs_warn(mp, "Unable to free reserved block pool. " xfs_warn(mp, "Unable to free reserved block pool. "
"Freespace may not be correct on next mount."); "Freespace may not be correct on next mount.");
error = xfs_log_sbcount(mp, 1); error = xfs_log_sbcount(mp);
if (error) if (error)
xfs_warn(mp, "Unable to update superblock counters. " xfs_warn(mp, "Unable to update superblock counters. "
"Freespace may not be correct on next mount."); "Freespace may not be correct on next mount.");
@ -1557,18 +1557,14 @@ xfs_fs_writable(xfs_mount_t *mp)
/* /*
* xfs_log_sbcount * xfs_log_sbcount
* *
* Called either periodically to keep the on disk superblock values * Sync the superblock counters to disk.
* roughly up to date or from unmount to make sure the values are
* correct on a clean unmount.
* *
* Note this code can be called during the process of freezing, so * 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. * block when the transaction subsystem is in its frozen state.
*/ */
int int
xfs_log_sbcount( xfs_log_sbcount(xfs_mount_t *mp)
xfs_mount_t *mp,
uint sync)
{ {
xfs_trans_t *tp; xfs_trans_t *tp;
int error; int error;
@ -1594,8 +1590,7 @@ xfs_log_sbcount(
} }
xfs_mod_sb(tp, XFS_SB_IFREE | XFS_SB_ICOUNT | XFS_SB_FDBLOCKS); xfs_mod_sb(tp, XFS_SB_IFREE | XFS_SB_ICOUNT | XFS_SB_FDBLOCKS);
if (sync) xfs_trans_set_sync(tp);
xfs_trans_set_sync(tp);
error = xfs_trans_commit(tp, 0); error = xfs_trans_commit(tp, 0);
return error; return error;
} }

2
fs/xfs/xfs_mount.h
View file

@ -371,7 +371,7 @@ typedef struct xfs_mod_sb {
int64_t msb_delta; /* Change to make to specified field */ int64_t msb_delta; /* Change to make to specified field */
} xfs_mod_sb_t; } 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 __uint64_t xfs_default_resblks(xfs_mount_t *mp);
extern int xfs_mountfs(xfs_mount_t *mp); extern int xfs_mountfs(xfs_mount_t *mp);