Commit 848c3ff8 authored Aug 22, 2024 by Chen Yufan Committed by Kent Overstreet Sep 09, 2024

bcachefs: Convert to use jiffies macros



Use jiffies macros instead of using jiffies directly to handle wraparound.

Signed-off-by: Chen Yufan <chenyufan@vivo.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

parent 94932a08

fs/bcachefs/alloc_background.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <linux/rcupdate.h>
		#include <linux/sched/task.h>
		#include <linux/sort.h>
		#include <linux/jiffies.h>

		static void bch2_discard_one_bucket_fast(struct bch_dev *, u64);

		@@ -2183,7 +2184,7 @@ int bch2_dev_freespace_init(struct bch_fs c, struct bch_dev ca,
		* freespace/need_discard/need_gc_gens btrees as needed:
		*/
		while (1) {
		if (last_updated + HZ * 10 < jiffies) {
		if (time_after(jiffies, last_updated + HZ * 10)) {
		bch_info(ca, "%s: currently at %llu/%llu",
		__func__, iter.pos.offset, ca->mi.nbuckets);
		last_updated = jiffies;

fs/bcachefs/journal_io.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1950,7 +1950,8 @@ static int bch2_journal_write_pick_flush(struct journal j, struct journal_buf
		if (error \|\|
		w->noflush \|\|
		(!w->must_flush &&
		(jiffies - j->last_flush_write) < msecs_to_jiffies(c->opts.journal_flush_delay) &&
		time_before(jiffies, j->last_flush_write +
		msecs_to_jiffies(c->opts.journal_flush_delay)) &&
		test_bit(JOURNAL_may_skip_flush, &j->flags))) {
		w->noflush = true;
		SET_JSET_NO_FLUSH(w->data, true);

fs/bcachefs/thread_with_file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -387,7 +387,7 @@ int bch2_stdio_redirect_readline_timeout(struct stdio_redirect *stdio,
		seen = buf->buf.nr;
		char *n = memchr(buf->buf.data, '\n', seen);

		if (!n && timeout != MAX_SCHEDULE_TIMEOUT && jiffies >= until) {
		if (!n && timeout != MAX_SCHEDULE_TIMEOUT && time_after_eq(jiffies, until)) {
		spin_unlock(&buf->lock);
		return -ETIME;
		}