Merge branch 'for-linus' into raid56-experimental

[~andy/linux] / fs / btrfs / root-tree.c

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index eb923d087da7848d445820213d53ff3b39d7d279..668af537a3ea2f38abeb7935bfe1d2f4b17132f1 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -548,9 +548,9 @@ void btrfs_update_root_times(struct btrfs_trans_handle *trans,
        struct btrfs_root_item *item = &root->root_item;
        struct timespec ct = CURRENT_TIME;
 
-       spin_lock(&root->root_times_lock);
+       spin_lock(&root->root_item_lock);
        item->ctransid = cpu_to_le64(trans->transid);
        item->ctime.sec = cpu_to_le64(ct.tv_sec);
        item->ctime.nsec = cpu_to_le32(ct.tv_nsec);
-       spin_unlock(&root->root_times_lock);
+       spin_unlock(&root->root_item_lock);
 }