Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs updates from Chris Mason:
 "The largest set of changes here come from Miao Xie.  He's cleaning up
  and improving read recovery/repair for raid, and has a number of
  related fixes.

  I've merged another set of fsync fixes from Filipe, and he's also
  improved the way we handle metadata write errors to make sure we force
  the FS readonly if things go wrong.

  Otherwise we have a collection of fixes and cleanups.  Dave Sterba
  gets a cookie for removing the most lines (thanks Dave)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (139 commits)
  btrfs: Fix compile error when CONFIG_SECURITY is not set.
  Btrfs: fix compiles when CONFIG_BTRFS_FS_RUN_SANITY_TESTS is off
  btrfs: Make btrfs handle security mount options internally to avoid losing security label.
  Btrfs: send, don't delay dir move if there's a new parent inode
  btrfs: add more superblock checks
  Btrfs: fix race in WAIT_SYNC ioctl
  Btrfs: be aware of btree inode write errors to avoid fs corruption
  Btrfs: remove redundant btrfs_verify_qgroup_counts declaration.
  btrfs: fix shadow warning on cmp
  Btrfs: fix compilation errors under DEBUG
  Btrfs: fix crash of btrfs_release_extent_buffer_page
  Btrfs: add missing end_page_writeback on submit_extent_page failure
  btrfs: Fix the wrong condition judgment about subset extent map
  Btrfs: fix build_backref_tree issue with multiple shared blocks
  Btrfs: cleanup error handling in build_backref_tree
  btrfs: move checks for DUMMY_ROOT into a helper
  btrfs: new define for the inline extent data start
  btrfs: kill extent_buffer_page helper
  btrfs: drop constant param from btrfs_release_extent_buffer_page
  btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB
  ...

1 files changed, 69 insertions, 16 deletions

diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h
index 4ee4e30d26d9..1faecea101f3 100644
--- a/include/trace/events/btrfs.h
+++ b/include/trace/events/btrfs.h
@@ -23,6 +23,7 @@ struct map_lookup;
 struct extent_buffer;
 struct btrfs_work;
 struct __btrfs_workqueue;
+struct btrfs_qgroup_operation;
 
 #define show_ref_type(type)                                             \
         __print_symbolic(type,                                          \
@@ -157,12 +158,13 @@ DEFINE_EVENT(btrfs__inode, btrfs_inode_evict,
 
 #define show_map_flags(flag)                                            \
         __print_flags(flag, "|",                                        \
-                { EXTENT_FLAG_PINNED,           "PINNED"        },      \
-                { EXTENT_FLAG_COMPRESSED,       "COMPRESSED"    },      \
-                { EXTENT_FLAG_VACANCY,          "VACANCY"       },      \
-                { EXTENT_FLAG_PREALLOC,         "PREALLOC"      },      \
-                { EXTENT_FLAG_LOGGING,          "LOGGING"       },      \
-                { EXTENT_FLAG_FILLING,          "FILLING"       })
+                { (1 << EXTENT_FLAG_PINNED),            "PINNED"        },\
+                { (1 << EXTENT_FLAG_COMPRESSED),        "COMPRESSED"    },\
+                { (1 << EXTENT_FLAG_VACANCY),           "VACANCY"       },\
+                { (1 << EXTENT_FLAG_PREALLOC),          "PREALLOC"      },\
+                { (1 << EXTENT_FLAG_LOGGING),           "LOGGING"       },\
+                { (1 << EXTENT_FLAG_FILLING),           "FILLING"       },\
+                { (1 << EXTENT_FLAG_FS_MAPPING),        "FS_MAPPING"    })
 
 TRACE_EVENT_CONDITION(btrfs_get_extent,
 
@@ -996,6 +998,7 @@ DECLARE_EVENT_CLASS(btrfs__work,
                 __field(        void *, func                    )
                 __field(        void *, ordered_func            )
                 __field(        void *, ordered_free            )
+                __field(        void *, normal_work             )
         ),
 
         TP_fast_assign(
@@ -1004,11 +1007,13 @@ DECLARE_EVENT_CLASS(btrfs__work,
                 __entry->func           = work->func;
                 __entry->ordered_func   = work->ordered_func;
                 __entry->ordered_free   = work->ordered_free;
+                __entry->normal_work    = &work->normal_work;
         ),
 
-        TP_printk("work=%p, wq=%p, func=%p, ordered_func=%p, ordered_free=%p",
-                  __entry->work, __entry->wq, __entry->func,
-                  __entry->ordered_func, __entry->ordered_free)
+        TP_printk("work=%p (normal_work=%p), wq=%p, func=%pf, ordered_func=%p,"
+                  " ordered_free=%p",
+                  __entry->work, __entry->normal_work, __entry->wq,
+                   __entry->func, __entry->ordered_func, __entry->ordered_free)
 );
 
 /* For situiations that the work is freed */
@@ -1043,13 +1048,6 @@ DEFINE_EVENT(btrfs__work, btrfs_work_sched,
         TP_ARGS(work)
 );
 
-DEFINE_EVENT(btrfs__work, btrfs_normal_work_done,
-
-        TP_PROTO(struct btrfs_work *work),
-
-        TP_ARGS(work)
-);
-
 DEFINE_EVENT(btrfs__work__done, btrfs_all_work_done,
 
         TP_PROTO(struct btrfs_work *work),
@@ -1119,6 +1117,61 @@ DEFINE_EVENT(btrfs__workqueue_done, btrfs_workqueue_destroy,
         TP_ARGS(wq)
 );
 
+#define show_oper_type(type)                                            \
+        __print_symbolic(type,                                          \
+                { BTRFS_QGROUP_OPER_ADD_EXCL,   "OPER_ADD_EXCL" },      \
+                { BTRFS_QGROUP_OPER_ADD_SHARED, "OPER_ADD_SHARED" },    \
+                { BTRFS_QGROUP_OPER_SUB_EXCL,   "OPER_SUB_EXCL" },      \
+                { BTRFS_QGROUP_OPER_SUB_SHARED, "OPER_SUB_SHARED" })
+
+DECLARE_EVENT_CLASS(btrfs_qgroup_oper,
+
+        TP_PROTO(struct btrfs_qgroup_operation *oper),
+
+        TP_ARGS(oper),
+
+        TP_STRUCT__entry(
+                __field(        u64,  ref_root          )
+                __field(        u64,  bytenr            )
+                __field(        u64,  num_bytes         )
+                __field(        u64,  seq               )
+                __field(        int,  type              )
+                __field(        u64,  elem_seq          )
+        ),
+
+        TP_fast_assign(
+                __entry->ref_root       = oper->ref_root;
+                __entry->bytenr         = oper->bytenr,
+                __entry->num_bytes      = oper->num_bytes;
+                __entry->seq            = oper->seq;
+                __entry->type           = oper->type;
+                __entry->elem_seq       = oper->elem.seq;
+        ),
+
+        TP_printk("ref_root = %llu, bytenr = %llu, num_bytes = %llu, "
+                  "seq = %llu, elem.seq = %llu, type = %s",
+                  (unsigned long long)__entry->ref_root,
+                  (unsigned long long)__entry->bytenr,
+                  (unsigned long long)__entry->num_bytes,
+                  (unsigned long long)__entry->seq,
+                  (unsigned long long)__entry->elem_seq,
+                  show_oper_type(__entry->type))
+);
+
+DEFINE_EVENT(btrfs_qgroup_oper, btrfs_qgroup_account,
+
+        TP_PROTO(struct btrfs_qgroup_operation *oper),
+
+        TP_ARGS(oper)
+);
+
+DEFINE_EVENT(btrfs_qgroup_oper, btrfs_qgroup_record_ref,
+
+        TP_PROTO(struct btrfs_qgroup_operation *oper),
+
+        TP_ARGS(oper)
+);
+
 #endif /* _TRACE_BTRFS_H */
 
 /* This part must be outside protection */