aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.c
diff options
context:
space:
mode:
authorAnand Jain <anand.jain@oracle.com>2012-12-07 04:28:54 -0500
committerChris Mason <chris.mason@fusionio.com>2012-12-16 20:46:21 -0500
commit5f3ab90a72f98adbf00c50ac2d4d2b47cf4a9685 (patch)
treee73de2c653e9db8e15e426476e5857970135ecdc /fs/btrfs/ctree.c
parentb8b8ff590f99678616f9ea85f5088542d1cfc0be (diff)
Btrfs: rename root_times_lock to root_item_lock
Originally root_times_lock was introduced as part of send/receive code however newly developed patch to label the subvol reused the same lock, so renaming it for a meaningful name. Signed-off-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r--fs/btrfs/ctree.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 5c2cf992e717..01efcbc80dfb 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -5114,13 +5114,13 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
5114 right_path->search_commit_root = 1; 5114 right_path->search_commit_root = 1;
5115 right_path->skip_locking = 1; 5115 right_path->skip_locking = 1;
5116 5116
5117 spin_lock(&left_root->root_times_lock); 5117 spin_lock(&left_root->root_item_lock);
5118 left_start_ctransid = btrfs_root_ctransid(&left_root->root_item); 5118 left_start_ctransid = btrfs_root_ctransid(&left_root->root_item);
5119 spin_unlock(&left_root->root_times_lock); 5119 spin_unlock(&left_root->root_item_lock);
5120 5120
5121 spin_lock(&right_root->root_times_lock); 5121 spin_lock(&right_root->root_item_lock);
5122 right_start_ctransid = btrfs_root_ctransid(&right_root->root_item); 5122 right_start_ctransid = btrfs_root_ctransid(&right_root->root_item);
5123 spin_unlock(&right_root->root_times_lock); 5123 spin_unlock(&right_root->root_item_lock);
5124 5124
5125 trans = btrfs_join_transaction(left_root); 5125 trans = btrfs_join_transaction(left_root);
5126 if (IS_ERR(trans)) { 5126 if (IS_ERR(trans)) {
@@ -5215,15 +5215,15 @@ int btrfs_compare_trees(struct btrfs_root *left_root,
5215 goto out; 5215 goto out;
5216 } 5216 }
5217 5217
5218 spin_lock(&left_root->root_times_lock); 5218 spin_lock(&left_root->root_item_lock);
5219 ctransid = btrfs_root_ctransid(&left_root->root_item); 5219 ctransid = btrfs_root_ctransid(&left_root->root_item);
5220 spin_unlock(&left_root->root_times_lock); 5220 spin_unlock(&left_root->root_item_lock);
5221 if (ctransid != left_start_ctransid) 5221 if (ctransid != left_start_ctransid)
5222 left_start_ctransid = 0; 5222 left_start_ctransid = 0;
5223 5223
5224 spin_lock(&right_root->root_times_lock); 5224 spin_lock(&right_root->root_item_lock);
5225 ctransid = btrfs_root_ctransid(&right_root->root_item); 5225 ctransid = btrfs_root_ctransid(&right_root->root_item);
5226 spin_unlock(&right_root->root_times_lock); 5226 spin_unlock(&right_root->root_item_lock);
5227 if (ctransid != right_start_ctransid) 5227 if (ctransid != right_start_ctransid)
5228 right_start_ctransid = 0; 5228 right_start_ctransid = 0;
5229 5229