Commit d349404f authored Apr 29, 2008 by David Chinner Committed by Lachlan McIlroy Apr 29, 2008

[XFS] Don't double count reserved block changes on UP.



On uniprocessor machines, the incore superblock is used for all in memory
accounting of free blocks. in this situation, changes to the reserved
block count are accounted twice; once directly and once via
xfs_mod_incore_sb(). Seeing as the modification on SMP is done via
xfs_mod_incore_sb(), make this the only update mechanism that UP uses as
well.

SGI-PV: 980654
SGI-Modid: xfs-linux-melb:xfs-kern:30997a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

parent fe0754f0

fs/xfs/xfs_fsops.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -552,11 +552,8 @@ retry:
		mp->m_resblks += free;
		mp->m_resblks_avail += free;
		fdblks_delta = -free;
		mp->m_sb.sb_fdblocks = XFS_ALLOC_SET_ASIDE(mp);
		} else {
		fdblks_delta = -delta;
		mp->m_sb.sb_fdblocks =
		lcounter + XFS_ALLOC_SET_ASIDE(mp);
		mp->m_resblks = request;
		mp->m_resblks_avail += delta;
		}
		@@ -587,7 +584,6 @@ out:
		if (error == ENOSPC)
		goto retry;
		}

		return 0;
		}

Admin message