lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] Re-initialize the per-cpu superblock counters after recovery.

Browse Source 
After filesystem recovery the superblock is re-read to bring in any
changes. If the per-cpu superblock counters are not re-initialized from
the superblock then the next time the per-cpu counters are disabled they
might overwrite the global counter with a bogus value.

SGI-PV: 957348
SGI-Modid: xfs-linux-melb:xfs-kern:27999a

Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Lachlan McIlroy
2007-02-10 18:36:29 +11:00
committed by Tim Shimmin
parent c97be73605
commit 5478eead85
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/xfs/xfs_log_recover.c
View File

@@ -3848,6 +3848,9 @@ xlog_do_recover(
ASSERT(XFS_SB_GOOD_VERSION(sbp)); ASSERT(XFS_SB_GOOD_VERSION(sbp));
xfs_buf_relse(bp); xfs_buf_relse(bp);
/* We've re-read the superblock so re-initialize per-cpu counters */
xfs_icsb_reinit_counters(log->l_mp);
xlog_recover_check_summary(log); xlog_recover_check_summary(log);
/* Normal transactions can now occur */ /* Normal transactions can now occur */

23
fs/xfs/xfs_mount.c
View File

@@ -543,11 +543,8 @@ xfs_readsb(xfs_mount_t *mp, int flags)
ASSERT(XFS_BUF_VALUSEMA(bp) <= 0); ASSERT(XFS_BUF_VALUSEMA(bp) <= 0);
} }
xfs_icsb_lock(mp); /* Initialize per-cpu counters */
xfs_icsb_balance_counter(mp, XFS_SBS_ICOUNT, 0, 0); xfs_icsb_reinit_counters(mp);
xfs_icsb_balance_counter(mp, XFS_SBS_IFREE, 0, 0);
xfs_icsb_balance_counter(mp, XFS_SBS_FDBLOCKS, 0, 0);
xfs_icsb_unlock(mp);
mp->m_sb_bp = bp; mp->m_sb_bp = bp;
xfs_buf_relse(bp); xfs_buf_relse(bp);
@@ -1811,6 +1808,22 @@ xfs_icsb_init_counters(
return 0; return 0;
} }
void
xfs_icsb_reinit_counters(
xfs_mount_t *mp)
{
xfs_icsb_lock(mp);
/*
* start with all counters disabled so that the
* initial balance kicks us off correctly
*/
mp->m_icsb_counters = -1;
xfs_icsb_balance_counter(mp, XFS_SBS_ICOUNT, 0, 0);
xfs_icsb_balance_counter(mp, XFS_SBS_IFREE, 0, 0);
xfs_icsb_balance_counter(mp, XFS_SBS_FDBLOCKS, 0, 0);
xfs_icsb_unlock(mp);
}
STATIC void STATIC void
xfs_icsb_destroy_counters( xfs_icsb_destroy_counters(
xfs_mount_t *mp) xfs_mount_t *mp)

2
fs/xfs/xfs_mount.h
View File

@@ -307,10 +307,12 @@ typedef struct xfs_icsb_cnts {
#define XFS_ICSB_LAZY_COUNT (1 << 1) /* accuracy not needed */ #define XFS_ICSB_LAZY_COUNT (1 << 1) /* accuracy not needed */
extern int xfs_icsb_init_counters(struct xfs_mount *); extern int xfs_icsb_init_counters(struct xfs_mount *);
extern void xfs_icsb_reinit_counters(struct xfs_mount *);
extern void xfs_icsb_sync_counters_flags(struct xfs_mount *, int); extern void xfs_icsb_sync_counters_flags(struct xfs_mount *, int);
#else #else
#define xfs_icsb_init_counters(mp) (0) #define xfs_icsb_init_counters(mp) (0)
#define xfs_icsb_reinit_counters(mp) do { } while (0)
#define xfs_icsb_sync_counters_flags(mp, flags) do { } while (0) #define xfs_icsb_sync_counters_flags(mp, flags) do { } while (0)
#endif #endif