summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2024-10-09 17:00:30 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2024-10-09 17:00:30 -0400
commita9e1597adcbc33fa50a159b04473914c496807a2 (patch)
tree8da7eb52dce997a57752bbeb015bd917fb2ec9de /include
parentf6e4cd2ef7c6ef7c3cf5a730f7ded9c48ccf689d (diff)
Update bcachefs sources to 3b80552e7057 bcachefs: __wait_for_freeing_inode: Switch to wait_bit_queue_entry656-debug
Diffstat (limited to 'include')
-rw-r--r--include/linux/closure.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/closure.h b/include/linux/closure.h
index c24d4aaf..880fe85e 100644
--- a/include/linux/closure.h
+++ b/include/linux/closure.h
@@ -464,10 +464,10 @@ do { \
while (1) { \
closure_wait(waitlist, &cl); \
if (_cond) { \
- _t = max(1, _until - jiffies); \
+ _t = max_t(long, 1L, _until - jiffies); \
break; \
} \
- _t = max(0, _until - jiffies); \
+ _t = max_t(long, 0L, _until - jiffies); \
if (!_t) \
break; \
closure_sync_timeout(&cl, _t); \
@@ -485,7 +485,7 @@ do { \
({ \
unsigned long _until = jiffies + _timeout; \
(_cond) \
- ? max(1, _until - jiffies) \
+ ? max_t(long, 1L, _until - jiffies) \
: __closure_wait_event_timeout(waitlist, _cond, _until);\
})