summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2021-04-12 11:48:36 -0400
committerKent Overstreet <kent.overstreet@gmail.com>2021-04-12 11:48:45 -0400
commitb422ff58ba8eedcfef3b67b66468660f07b0cfc1 (patch)
treeb9a02fbf56200076c7692b3ab7863bba5c98985d /include
parent816ec6051675444d28a2b52ca3aac2558e9178c4 (diff)
Update bcachefs sources to a8b3ce7599 fixup! bcachefs: Eliminate more PAGE_SIZE uses
Diffstat (limited to 'include')
-rw-r--r--include/linux/string.h1
-rw-r--r--include/trace/events/bcachefs.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/string.h b/include/linux/string.h
index 4806e2c5..b5e00a09 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -11,5 +11,6 @@ extern void memzero_explicit(void *, size_t);
int match_string(const char * const *, size_t, const char *);
#define kstrndup(s, n, gfp) strndup(s, n)
+#define kstrdup(s, gfp) strdup(s)
#endif /* _LINUX_STRING_H_ */
diff --git a/include/trace/events/bcachefs.h b/include/trace/events/bcachefs.h
index d4cb7a29..5ab05693 100644
--- a/include/trace/events/bcachefs.h
+++ b/include/trace/events/bcachefs.h
@@ -716,6 +716,11 @@ DEFINE_EVENT(transaction_restart, trans_restart_iter_upgrade,
TP_ARGS(ip)
);
+DEFINE_EVENT(transaction_restart, trans_restart_relock,
+ TP_PROTO(unsigned long ip),
+ TP_ARGS(ip)
+);
+
DEFINE_EVENT(transaction_restart, trans_restart_traverse,
TP_PROTO(unsigned long ip),
TP_ARGS(ip)