libbe: bail out early if the zfs kmod isn't loaded
ClosedPublic
Actions

Authored by kevans on Aug 13 2022, 12:22 AM.

Details

Reviewers

allanjude
cperciva
rew
jwmaag_gmail.com

Commits

rG2f700ca965a0: libbe: bail out early if the zfs kmod isn't loaded

Summary

As noted in the comment, we already know the rest of libbe_init() will
fail because there's no pool imported. Avoid the side effect by
checking beforehand and bailing out early.

With this, freebsd-update(8) should no longer trigger a load of the zfs
kmod just because it runs bectl check.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 46917
Build 43806: arc lint + arc unit

Event Timeline

kevans created this revision.Aug 13 2022, 12:22 AM

Herald added a subscriber: imp. · View Herald TranscriptAug 13 2022, 12:22 AM

Harbormaster completed remote builds in B46917: Diff 109282.Aug 13 2022, 12:22 AM

kevans requested review of this revision.Aug 13 2022, 12:22 AM

rew accepted this revision.Aug 14 2022, 3:37 AM

This revision is now accepted and ready to land.Aug 14 2022, 3:37 AM

jwmaag_gmail.com accepted this revision.Aug 16 2022, 1:48 AM

Closed by commit rG2f700ca965a0: libbe: bail out early if the zfs kmod isn't loaded (authored by kevans). · Explain WhyJul 7 2023, 12:41 AM

This revision was automatically updated to reflect the committed changes.

kevans added a commit: rG2f700ca965a0: libbe: bail out early if the zfs kmod isn't loaded.

Revision Contents
Changeset List

Path

Size

lib/

libbe/

be.c

11 lines

Diff 109282

View Options

lib/libbe/be.c

	Show All 39 Lines

	#define jiffies ticks			#define jiffies ticks
	#define jiffies_64 ticks			#define jiffies_64 ticks
	#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)			#define jiffies_to_msecs(x) (((int64_t)(int)(x)) * 1000 / hz)

	#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)			#define MAX_JIFFY_OFFSET ((INT_MAX >> 1) - 1)

	#define time_after(a, b) ((int)((b) - (a)) < 0)			#define time_after(a, b) ((int)((b) - (a)) < 0)
				#define time_after32(a, b) ((int32_t)((uint32_t)(b) - (uint32_t)(a)) < 0)
				hselaskyUnsubmitted Done Inline Actions Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of things will break. hselasky: Define time_after32() like time_after() . int is always 32-bit on our platforms. Else a lot of…
				manuAuthorUnsubmitted Done Inline Actions Linux cast the operand to uint32_t, I guess some code can rely on that. manu: Linux cast the operand to uint32_t, I guess some code can rely on that.
				hselaskyUnsubmitted Done Inline Actions I don't see how casting the arguments makes any difference in C- ? Can you investigate? Adding Konstantin here. hselasky: I don't see how casting the arguments makes any difference in C- ? Can you investigate?
	#define time_before(a, b) time_after(b,a)			#define time_before(a, b) time_after(b,a)
				#define time_before32(a, b) time_after32(b, a)
	#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)			#define time_after_eq(a, b) ((int)((a) - (b)) >= 0)
	#define time_before_eq(a, b) time_after_eq(b, a)			#define time_before_eq(a, b) time_after_eq(b, a)
	#define time_in_range(a,b,c) \			#define time_in_range(a,b,c) \
	(time_after_eq(a,b) && time_before_eq(a,c))			(time_after_eq(a,b) && time_before_eq(a,c))
	#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)			#define time_is_after_eq_jiffies(a) time_after_eq(a, jiffies)

	#define HZ hz			#define HZ hz

	▲ Show 20 Lines • Show All 108 Lines • Show Last 20 Lines

libbe: bail out early if the zfs kmod isn't loadedClosedPublicActions