> - if ((error = xfs_alloc_get_freelist(args->tp, args->agbp,
> &fbno)))
> + error = xfs_alloc_get_freelist(args->tp, args->agbp, &fbno, 0);
> + if (error)
Nice cleanup here.
> - if ((error = xfs_alloc_get_freelist(tp, agbp, &bno)))
> + if ((error = xfs_alloc_get_freelist(tp, agbp, &bno, 0)))
but not here. Any chance you could use the linux kernel prefered style in the
first
hunk everywhere? Especially in new code where the patch uses the second style
aswell.
> +#define XFS_SB_VERSION2_LAZYSBCOUNTBIT 0x00000002 /* Superblk
> counters */
The flag seems a bit misnamed to me. It's really about counting the freelist
blocks, not the lazy counters that require it. But given that it's been in
IRIX for a while that's probably not something we could change.
> +#define XFS_SB_VERSION_LAZYSBCOUNT(sbp)
> xfs_sb_version_haslazysbcount(sbp)
> +static inline int xfs_sb_version_haslazysbcount(xfs_sb_t *sbp)
Please just use the inline version everywhere and don't introduce the
uppercase superflous macro.
> + * Write into superblock the fields that we haven't
> + * been logging - allocated/free inode and free block
> + * counts - from the incore superblock.
> + */
> + error = xfs_log_sbcount(mp, (XFS_LOG_FORCE|XFS_LOG_SYNC));
>
> - xfs_icsb_sync_counters(mp);
> + sbp = xfs_getsb(mp, 0);
> + sb = XFS_BUF_TO_SBP(sbp);
> + if (error) {
> + /*
> + * Hmmm - failed to get log reservations so just
> + * do the mod without a transaction. Whine about
> + * it, too.
> + */
> + ASSERT(XFS_SB_VERSION_LAZYSBCOUNT(&mp->m_sb));
> + xfs_fs_cmn_err(CE_NOTE, mp,
> + "Unmounting, non-transactional sb update");
> + s = XFS_SB_LOCK(mp);
> + INT_SET(sb->sb_icount, ARCH_CONVERT,
> mp->m_sb.sb_icount);
> + INT_SET(sb->sb_ifree, ARCH_CONVERT, mp->m_sb.sb_ifree);
> + INT_SET(sb->sb_fdblocks, ARCH_CONVERT,
> mp->m_sb.sb_fdblocks);
> + XFS_SB_UNLOCK(mp, s);
This is really quite nasty. Should we at least force a cache flush here?
> + *
> + * We also update the disk superblock with incore counter
> + * values if we are using non-persistent counters so that
> + * they don't get too far out of sync if we crash or get a
> + * forced shutdown. We don't want to force this to disk,
> + * just get a transaction into the iclogs....
> */
> if (flags & SYNC_REFCACHE) {
> if (flags & SYNC_WAIT)
> xfs_refcache_purge_mp(mp);
> else
> xfs_refcache_purge_some(mp);
> + xfs_log_sbcount(mp, 0);
Can you please give this a SYNC_ flag of it's own? SYNC_REFCACHE is
misnamed for this, and I hope it will go away once we stop pretending
to support 2.4 builds.
|