diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-10-30 01:55:58 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@sgi.com> | 2008-10-30 01:55:58 -0400 |
commit | 8df4da4a0a642d3a016028c0d922bcb4d5a4a6d7 (patch) | |
tree | 29b07230f8269ef12a10665d757a6e935c4e2e49 /fs/xfs/xfs_bmap.c | |
parent | 637aa50f461b8ea6b1e8bf9877b0d13d00085043 (diff) |
[XFS] implement generic xfs_btree_decrement
From: Dave Chinner <dgc@sgi.com>
[hch: split out from bigger patch and minor adaptions]
SGI-PV: 985583
SGI-Modid: xfs-linux-melb:xfs-kern:32191a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Bill O'Donnell <billodo@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_bmap.c')
-rw-r--r-- | fs/xfs/xfs_bmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c index 4b1ec44c80aa..bdbab54948fc 100644 --- a/fs/xfs/xfs_bmap.c +++ b/fs/xfs/xfs_bmap.c | |||
@@ -820,7 +820,7 @@ xfs_bmap_add_extent_delay_real( | |||
820 | if ((error = xfs_bmbt_delete(cur, &i))) | 820 | if ((error = xfs_bmbt_delete(cur, &i))) |
821 | goto done; | 821 | goto done; |
822 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 822 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
823 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 823 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
824 | goto done; | 824 | goto done; |
825 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 825 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
826 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, | 826 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, |
@@ -1381,13 +1381,13 @@ xfs_bmap_add_extent_unwritten_real( | |||
1381 | if ((error = xfs_bmbt_delete(cur, &i))) | 1381 | if ((error = xfs_bmbt_delete(cur, &i))) |
1382 | goto done; | 1382 | goto done; |
1383 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1383 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1384 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 1384 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
1385 | goto done; | 1385 | goto done; |
1386 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1386 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1387 | if ((error = xfs_bmbt_delete(cur, &i))) | 1387 | if ((error = xfs_bmbt_delete(cur, &i))) |
1388 | goto done; | 1388 | goto done; |
1389 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1389 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1390 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 1390 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
1391 | goto done; | 1391 | goto done; |
1392 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1392 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1393 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, | 1393 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, |
@@ -1430,7 +1430,7 @@ xfs_bmap_add_extent_unwritten_real( | |||
1430 | if ((error = xfs_bmbt_delete(cur, &i))) | 1430 | if ((error = xfs_bmbt_delete(cur, &i))) |
1431 | goto done; | 1431 | goto done; |
1432 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1432 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1433 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 1433 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
1434 | goto done; | 1434 | goto done; |
1435 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1435 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1436 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, | 1436 | if ((error = xfs_bmbt_update(cur, LEFT.br_startoff, |
@@ -1473,7 +1473,7 @@ xfs_bmap_add_extent_unwritten_real( | |||
1473 | if ((error = xfs_bmbt_delete(cur, &i))) | 1473 | if ((error = xfs_bmbt_delete(cur, &i))) |
1474 | goto done; | 1474 | goto done; |
1475 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1475 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1476 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 1476 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
1477 | goto done; | 1477 | goto done; |
1478 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 1478 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
1479 | if ((error = xfs_bmbt_update(cur, new->br_startoff, | 1479 | if ((error = xfs_bmbt_update(cur, new->br_startoff, |
@@ -1556,7 +1556,7 @@ xfs_bmap_add_extent_unwritten_real( | |||
1556 | PREV.br_blockcount - new->br_blockcount, | 1556 | PREV.br_blockcount - new->br_blockcount, |
1557 | oldext))) | 1557 | oldext))) |
1558 | goto done; | 1558 | goto done; |
1559 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 1559 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
1560 | goto done; | 1560 | goto done; |
1561 | if (xfs_bmbt_update(cur, LEFT.br_startoff, | 1561 | if (xfs_bmbt_update(cur, LEFT.br_startoff, |
1562 | LEFT.br_startblock, | 1562 | LEFT.br_startblock, |
@@ -2108,7 +2108,7 @@ xfs_bmap_add_extent_hole_real( | |||
2108 | if ((error = xfs_bmbt_delete(cur, &i))) | 2108 | if ((error = xfs_bmbt_delete(cur, &i))) |
2109 | goto done; | 2109 | goto done; |
2110 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 2110 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
2111 | if ((error = xfs_bmbt_decrement(cur, 0, &i))) | 2111 | if ((error = xfs_btree_decrement(cur, 0, &i))) |
2112 | goto done; | 2112 | goto done; |
2113 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); | 2113 | XFS_WANT_CORRUPTED_GOTO(i == 1, done); |
2114 | if ((error = xfs_bmbt_update(cur, left.br_startoff, | 2114 | if ((error = xfs_bmbt_update(cur, left.br_startoff, |