From 005a4a980a8e2546356fe331111e28315bbb58ee Mon Sep 17 00:00:00 2001 From: Stefan Behrens Date: Fri, 27 Apr 2012 12:41:46 -0400 Subject: [PATCH] --- yaml --- r: 299819 b: refs/heads/master c: 1f699d38b6556c393ac80f1c23c2053502a51631 h: refs/heads/master i: 299817: 097bfa293cee9de1936800d3f169aabca0eef1bc 299815: ee560ae471d8691138127315bc93a505c5a8e31a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/extent-tree.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d84aeaa742d1..ed5a12bc0d3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1daf3540fa77faea2f91d96bcaf07ce48ee827be +refs/heads/master: 1f699d38b6556c393ac80f1c23c2053502a51631 diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c index 84497f8eb043..6fc2e6f5aab8 100644 --- a/trunk/fs/btrfs/extent-tree.c +++ b/trunk/fs/btrfs/extent-tree.c @@ -4214,8 +4214,8 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info) num_bytes = calc_global_metadata_size(fs_info); - spin_lock(&block_rsv->lock); spin_lock(&sinfo->lock); + spin_lock(&block_rsv->lock); block_rsv->size = num_bytes; @@ -4241,8 +4241,8 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info) block_rsv->full = 1; } - spin_unlock(&sinfo->lock); spin_unlock(&block_rsv->lock); + spin_unlock(&sinfo->lock); } static void init_global_block_rsv(struct btrfs_fs_info *fs_info)