lib: os: Fix ZVFS leaking without being enabled#101415
Merged
MaureenHelm merged 1 commit intozephyrproject-rtos:mainfrom Jan 9, 2026
Merged
lib: os: Fix ZVFS leaking without being enabled#101415MaureenHelm merged 1 commit intozephyrproject-rtos:mainfrom
MaureenHelm merged 1 commit intozephyrproject-rtos:mainfrom
Conversation
Member
|
@nordicjm - LGTM other than one small change needed to avoid compile errors. diff --git a/include/zephyr/sys/fdtable.h b/include/zephyr/sys/fdtable.h
index 50896db79a3..4903a5ae341 100644
--- a/include/zephyr/sys/fdtable.h
+++ b/include/zephyr/sys/fdtable.h
@@ -257,7 +257,11 @@ struct zvfs_pollfd {
__syscall int zvfs_poll(struct zvfs_pollfd *fds, int nfds, int poll_timeout);
struct zvfs_fd_set {
+#ifdef ZVFS_OPEN_SIZE
uint32_t bitset[DIV_ROUND_UP(ZVFS_OPEN_SIZE, 32)];
+#else
+ uint32_t bitset[1];
+#endif
};
/** @brief Number of file descriptors which can be added @ref zvfs_fd_set */ |
peter-mitsis
previously approved these changes
Jan 7, 2026
Contributor
Author
Thanks, added |
Fixes this define leaking into all application source files when the feature is not even enabled Co-authored-by: Chris Friedt <cfriedt@tenstorrent.com> Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
|
nashif
approved these changes
Jan 9, 2026
peter-mitsis
approved these changes
Jan 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes this define leaking into all application source files when the feature is not even enabled
Fixes #101414