Btrfs: fix race between adding and putting tree mod seq elements and nodes

[mirror_ubuntu-bionic-kernel.git] / fs / btrfs / ctree.h

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 54a9bdc035571c8b126dd5341e9a91ed871e02a8..77510000d5a3aa44f038c9d0146c1cd36c0a67f4 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -869,14 +869,12 @@ struct btrfs_fs_info {
        struct list_head delayed_iputs;
        struct mutex cleaner_delayed_iput_mutex;
 
-       /* this protects tree_mod_seq_list */
-       spinlock_t tree_mod_seq_lock;
        atomic64_t tree_mod_seq;
-       struct list_head tree_mod_seq_list;
 
-       /* this protects tree_mod_log */
+       /* this protects tree_mod_log and tree_mod_seq_list */
        rwlock_t tree_mod_log_lock;
        struct rb_root tree_mod_log;
+       struct list_head tree_mod_seq_list;
 
        atomic_t async_delalloc_pages;
        atomic_t open_ioctl_trans;