diff options
author | Anand Jain <anand.jain@oracle.com> | 2012-12-07 04:28:54 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2012-12-16 20:46:21 -0500 |
commit | 5f3ab90a72f98adbf00c50ac2d4d2b47cf4a9685 (patch) | |
tree | e73de2c653e9db8e15e426476e5857970135ecdc /fs/btrfs/send.c | |
parent | b8b8ff590f99678616f9ea85f5088542d1cfc0be (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/send.c')
-rw-r--r-- | fs/btrfs/send.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index e78b297b0b00..54454542ad40 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
@@ -4397,9 +4397,9 @@ static int full_send_tree(struct send_ctx *sctx) | |||
4397 | if (!path) | 4397 | if (!path) |
4398 | return -ENOMEM; | 4398 | return -ENOMEM; |
4399 | 4399 | ||
4400 | spin_lock(&send_root->root_times_lock); | 4400 | spin_lock(&send_root->root_item_lock); |
4401 | start_ctransid = btrfs_root_ctransid(&send_root->root_item); | 4401 | start_ctransid = btrfs_root_ctransid(&send_root->root_item); |
4402 | spin_unlock(&send_root->root_times_lock); | 4402 | spin_unlock(&send_root->root_item_lock); |
4403 | 4403 | ||
4404 | key.objectid = BTRFS_FIRST_FREE_OBJECTID; | 4404 | key.objectid = BTRFS_FIRST_FREE_OBJECTID; |
4405 | key.type = BTRFS_INODE_ITEM_KEY; | 4405 | key.type = BTRFS_INODE_ITEM_KEY; |
@@ -4422,9 +4422,9 @@ join_trans: | |||
4422 | * Make sure the tree has not changed after re-joining. We detect this | 4422 | * Make sure the tree has not changed after re-joining. We detect this |
4423 | * by comparing start_ctransid and ctransid. They should always match. | 4423 | * by comparing start_ctransid and ctransid. They should always match. |
4424 | */ | 4424 | */ |
4425 | spin_lock(&send_root->root_times_lock); | 4425 | spin_lock(&send_root->root_item_lock); |
4426 | ctransid = btrfs_root_ctransid(&send_root->root_item); | 4426 | ctransid = btrfs_root_ctransid(&send_root->root_item); |
4427 | spin_unlock(&send_root->root_times_lock); | 4427 | spin_unlock(&send_root->root_item_lock); |
4428 | 4428 | ||
4429 | if (ctransid != start_ctransid) { | 4429 | if (ctransid != start_ctransid) { |
4430 | WARN(1, KERN_WARNING "btrfs: the root that you're trying to " | 4430 | WARN(1, KERN_WARNING "btrfs: the root that you're trying to " |