aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent-tree.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-12-15 15:54:40 -0500
committerChris Mason <chris.mason@oracle.com>2008-12-15 15:54:40 -0500
commit75eff68ea6959efd999b125fc3dcf73931a3b30b (patch)
tree8467dd51761446dd3539e515055671e707b5f5a0 /fs/btrfs/extent-tree.c
parent42dc7babdcc99feadb04d461592ce5898a362550 (diff)
Btrfs: Don't use spin*lock_irq for the delalloc lock
The delalloc lock doesn't need to have irqs disabled, nobody that changes the number of delalloc bytes in the FS is running with irqs off. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r--fs/btrfs/extent-tree.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 8004695d24d6..fbd6a8f28b52 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -1047,11 +1047,11 @@ search:
1047 end = pos; 1047 end = pos;
1048 1048
1049 /* update the free space counters */ 1049 /* update the free space counters */
1050 spin_lock_irq(&info->delalloc_lock); 1050 spin_lock(&info->delalloc_lock);
1051 super_used = btrfs_super_bytes_used(&info->super_copy); 1051 super_used = btrfs_super_bytes_used(&info->super_copy);
1052 btrfs_set_super_bytes_used(&info->super_copy, 1052 btrfs_set_super_bytes_used(&info->super_copy,
1053 super_used - bytes_freed); 1053 super_used - bytes_freed);
1054 spin_unlock_irq(&info->delalloc_lock); 1054 spin_unlock(&info->delalloc_lock);
1055 1055
1056 root_used = btrfs_root_used(&extent_root->root_item); 1056 root_used = btrfs_root_used(&extent_root->root_item);
1057 btrfs_set_root_used(&extent_root->root_item, 1057 btrfs_set_root_used(&extent_root->root_item,
@@ -2463,11 +2463,11 @@ static int __free_extent(struct btrfs_trans_handle *trans,
2463 BUG_ON(ret < 0); 2463 BUG_ON(ret < 0);
2464 } 2464 }
2465 /* block accounting for super block */ 2465 /* block accounting for super block */
2466 spin_lock_irq(&info->delalloc_lock); 2466 spin_lock(&info->delalloc_lock);
2467 super_used = btrfs_super_bytes_used(&info->super_copy); 2467 super_used = btrfs_super_bytes_used(&info->super_copy);
2468 btrfs_set_super_bytes_used(&info->super_copy, 2468 btrfs_set_super_bytes_used(&info->super_copy,
2469 super_used - num_bytes); 2469 super_used - num_bytes);
2470 spin_unlock_irq(&info->delalloc_lock); 2470 spin_unlock(&info->delalloc_lock);
2471 2471
2472 /* block accounting for root item */ 2472 /* block accounting for root item */
2473 root_used = btrfs_root_used(&root->root_item); 2473 root_used = btrfs_root_used(&root->root_item);
@@ -3151,10 +3151,10 @@ static int __btrfs_alloc_reserved_extent(struct btrfs_trans_handle *trans,
3151 parent = ins->objectid; 3151 parent = ins->objectid;
3152 3152
3153 /* block accounting for super block */ 3153 /* block accounting for super block */
3154 spin_lock_irq(&info->delalloc_lock); 3154 spin_lock(&info->delalloc_lock);
3155 super_used = btrfs_super_bytes_used(&info->super_copy); 3155 super_used = btrfs_super_bytes_used(&info->super_copy);
3156 btrfs_set_super_bytes_used(&info->super_copy, super_used + num_bytes); 3156 btrfs_set_super_bytes_used(&info->super_copy, super_used + num_bytes);
3157 spin_unlock_irq(&info->delalloc_lock); 3157 spin_unlock(&info->delalloc_lock);
3158 3158
3159 /* block accounting for root item */ 3159 /* block accounting for root item */
3160 root_used = btrfs_root_used(&root->root_item); 3160 root_used = btrfs_root_used(&root->root_item);