diff options
author | Alex Elder <aelder@sgi.com> | 2010-05-24 12:57:36 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-05-24 12:57:36 -0400 |
commit | 88e88374ee4958786397a57f684de6f1fc5e0242 (patch) | |
tree | 750fe86ece5d65e597223eb07c5ce7cf5b3749a0 /fs/xfs/xfs_alloc_btree.c | |
parent | 7e125f7b9cbfce4101191b8076d606c517a73066 (diff) | |
parent | ccf7c23fc129e75ef60e6f59f60a485b7a056598 (diff) |
Merge branch 'delayed-logging-for-2.6.35' into for-linus
Diffstat (limited to 'fs/xfs/xfs_alloc_btree.c')
-rw-r--r-- | fs/xfs/xfs_alloc_btree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_alloc_btree.c b/fs/xfs/xfs_alloc_btree.c index b726e10d2c1c..83f494218759 100644 --- a/fs/xfs/xfs_alloc_btree.c +++ b/fs/xfs/xfs_alloc_btree.c | |||
@@ -134,7 +134,7 @@ xfs_allocbt_free_block( | |||
134 | * disk. If a busy block is allocated, the iclog is pushed up to the | 134 | * disk. If a busy block is allocated, the iclog is pushed up to the |
135 | * LSN that freed the block. | 135 | * LSN that freed the block. |
136 | */ | 136 | */ |
137 | xfs_alloc_mark_busy(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1); | 137 | xfs_alloc_busy_insert(cur->bc_tp, be32_to_cpu(agf->agf_seqno), bno, 1); |
138 | xfs_trans_agbtree_delta(cur->bc_tp, -1); | 138 | xfs_trans_agbtree_delta(cur->bc_tp, -1); |
139 | return 0; | 139 | return 0; |
140 | } | 140 | } |