Fix #1433, use virtual path as name for FS_BASED maps#1448
Merged
Conversation
jphickey
force-pushed
the
fix-1433-fixedmap
branch
from
56ba9a9 to
47b2e41
Compare
Use the "virtual_path" instead of "device_name" as the name record for FS_BASED entries. This should allow duplicate detection to work as expected. The device_name on mappings made via this method will now be an empty string. It is not relevant because this type of map is used for devices that are already mounted.
jphickey
force-pushed
the
fix-1433-fixedmap
branch
from
47b2e41 to
b3cdc13
Compare
jphickey
added
the
CCB:Ready
dzbaker
added
CCB:Approved
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Feb 22, 2024
*Combines:* cFE equuleus-rc1+dev94 osal equuleus-rc1+dev47 to_lab equuleus-rc1+dev42 **Includes:** *cFE* - nasa/cFE#2515 *osal* - nasa/osal#1448 - nasa/osal#1450 *to_lab* - nasa/to_lab#191 Co-authored by: Joseph Hickey <[email protected]> Co-authored by: Avi Weiss <[email protected]>
This was referenced Feb 22, 2024
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Feb 23, 2024
*Combines:* cFE equuleus-rc1+dev96 osal equuleus-rc1+dev53 to_lab equuleus-rc1+dev44 **Includes:** *cFE* - nasa/cFE#2515 - nasa/cFE#2330 *osal* - nasa/osal#1448 - nasa/osal#1146 - nasa/osal#1357 - nasa/osal#1354 - nasa/osal#1331 *to_lab* - nasa/to_lab#191 - nasa/to_lab#136 Co-authored by: Joseph Hickey <[email protected]> Co-authored by: Avi Weiss <[email protected]> Co-authored by: Sam Price <[email protected]>
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Feb 23, 2024
*Combines:* cFE equuleus-rc1+dev96 osal equuleus-rc1+dev53 to_lab equuleus-rc1+dev44 **Includes:** *cFE* - nasa/cFE#2515 - nasa/cFE#2330 *osal* - nasa/osal#1448 - nasa/osal#1146 - nasa/osal#1357 - nasa/osal#1354 - nasa/osal#1331 *to_lab* - nasa/to_lab#191 - nasa/to_lab#136 Co-authored by: Joseph Hickey <[email protected]> Co-authored by: Avi Weiss <[email protected]> Co-authored by: Sam Price <[email protected]>
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
2 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.
Checklist (Please check before submitting)
Describe the contribution
Use the "virtual_path" instead of "device_name" as the name record for FS_BASED entries. This should allow duplicate detection to work as expected.
The device_name on mappings made via this method will now be an empty string. It is not relevant because this type of map is used for devices that are already mounted.
Fixes #1433
Testing performed
Run all tests, validate OSAL behavior
Expected behavior changes
Using
OS_FileSysAddFixedMap()with similar system paths should work as expected.System(s) tested on
Debian
Additional context
Duplicate detection is now done on virtual path, not system path. Therefore it is (theoretically) possible to mount the same system path in more than one virtual location, but the same virtual location cannot be mapped to multiple system paths. This makes more sense than the inverse.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.