diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-10 19:19:09 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-04-10 19:23:58 -0400 |
| commit | c598d91dcb0c7e95abdacb2711898ae14ab52ca1 (patch) | |
| tree | 645b7838f62826547ea0c830738a88061827c698 /include | |
| parent | ff5e165532a2eed87700649d03f91a612a58e92a (diff) | |
Update bcachefs sources to edf5f38218 bcachefs: Refactor superblock code
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/bug.h | 2 | ||||
| -rw-r--r-- | include/trace/events/bcachefs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/bug.h b/include/linux/bug.h index e25568c8..f8929688 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -15,7 +15,7 @@ #define BUG_ON(cond) assert(!(cond)) #define WARN_ON_ONCE(cond) ({ bool _r = (cond); if (_r) assert(0); _r; }) -#define WARN_ONCE(cond, msg) ({ bool _r = (cond); if (_r) assert(0); _r; }) +#define WARN_ONCE(cond, ...) ({ bool _r = (cond); if (_r) assert(0); _r; }) #define __WARN() assert(0) #define __WARN_printf(arg...) assert(0) diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h index a7be2d82..a34574ca 100644 --- a/include/trace/events/bcachefs.h +++ b/include/trace/events/bcachefs.h @@ -319,7 +319,7 @@ TRACE_EVENT(btree_gc_coalesce_fail, TP_fast_assign( __entry->reason = reason; - memcpy(__entry->uuid, c->disk_sb->user_uuid.b, 16); + memcpy(__entry->uuid, c->disk_sb.sb->user_uuid.b, 16); ), TP_printk("%pU: %u", __entry->uuid, __entry->reason) |