Skip to contentSkip to conversation

xfs: Make xfs_trans_mod_sb() aware of negative deltas

PATCH In review Jeff Liu 1 participant 1 message Nov 16, 2012 XFS filesystem

lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH 15/15 xfs: Make xfs_trans_mod_sb() aware of negative deltas

For FS shrink, the FS_DBLOCKS will be reduced, and maybe the AG count will be decreased as well if there have empty AGs beyond the new FS size. This patch is trying to make xfs_trans_mod_sb() aware of those possible negative delta values for shrinkfs only.

---
 fs/xfs/xfs_trans.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
fs/xfs/xfs_trans.c +9 -3
index d7346da..6ae2627 100644
@@ -864,7 +864,7 @@ xfs_trans_mod_sb(
 		 * transaction.  Make sure it does not exceed the
 		 * number reserved.
 		 */
-		if (delta < 0) {
+		if (delta < 0 && tp->t_type != XFS_TRANS_SHRINKFS) {
 			tp->t_blk_res_used += (uint)-delta;
 			ASSERT(tp->t_blk_res_used <= tp->t_blk_res);
 		}
@@ -905,11 +905,17 @@ xfs_trans_mod_sb(
 		tp->t_res_frextents_delta += delta;
 		break;
 	case XFS_TRANS_SB_DBLOCKS:
-		ASSERT(delta > 0);
+		if (tp->t_type != XFS_TRANS_SHRINKFS)
+			ASSERT(delta > 0);
+		else
+			ASSERT(delta < 0);
 		tp->t_dblocks_delta += delta;
 		break;
 	case XFS_TRANS_SB_AGCOUNT:
-		ASSERT(delta > 0);
+		if (tp->t_type != XFS_TRANS_SHRINKFS)
+			ASSERT(delta > 0);
+		else
+			ASSERT(delta < 0);
 		tp->t_agcount_delta += delta;
 		break;
 	case XFS_TRANS_SB_IMAXPCT:
Signature · 6 lines
1.7.9.5

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs