Merge branch 'pm-cpufreq'

[linux.git] / fs / btrfs / delayed-ref.c

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index df3bd880061d4ed19a215ca2b77df9365a2bdea0..dfdb7d4f8406d6e8584e81162fa36d97e4db6744 100644 (file)
--- a/fs/btrfs/delayed-ref.c
+++ b/fs/btrfs/delayed-ref.c
@@ -492,7 +492,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,
        if (head->is_data)
                return;
 
-       spin_lock(&fs_info->tree_mod_seq_lock);
+       read_lock(&fs_info->tree_mod_log_lock);
        if (!list_empty(&fs_info->tree_mod_seq_list)) {
                struct seq_list *elem;
 
@@ -500,7 +500,7 @@ void btrfs_merge_delayed_refs(struct btrfs_trans_handle *trans,
                                        struct seq_list, list);
                seq = elem->seq;
        }
-       spin_unlock(&fs_info->tree_mod_seq_lock);
+       read_unlock(&fs_info->tree_mod_log_lock);
 
 again:
        for (node = rb_first_cached(&head->ref_tree); node;
@@ -518,7 +518,7 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq)
        struct seq_list *elem;
        int ret = 0;
 
-       spin_lock(&fs_info->tree_mod_seq_lock);
+       read_lock(&fs_info->tree_mod_log_lock);
        if (!list_empty(&fs_info->tree_mod_seq_list)) {
                elem = list_first_entry(&fs_info->tree_mod_seq_list,
                                        struct seq_list, list);
@@ -531,7 +531,7 @@ int btrfs_check_delayed_seq(struct btrfs_fs_info *fs_info, u64 seq)
                }
        }
 
-       spin_unlock(&fs_info->tree_mod_seq_lock);
+       read_unlock(&fs_info->tree_mod_log_lock);
        return ret;
 }