Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1433, use virtual path as name for FS_BASED maps #1448

Merged
merged 1 commit into from
Feb 23, 2024

Conversation

jphickey
Copy link
Contributor

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.

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 jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Feb 14, 2024
@dzbaker dzbaker added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Feb 15, 2024
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 <jphickey@users.noreply.github.com>
Co-authored by: Avi Weiss <thnkslprpt@users.noreply.github.com>
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 <jphickey@users.noreply.github.com>
Co-authored by: Avi Weiss <thnkslprpt@users.noreply.github.com>
Co-authored by: Sam Price <thesamprice@users.noreply.github.com>
@dzbaker dzbaker merged commit 04149d8 into nasa:main Feb 23, 2024
20 checks passed
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 <jphickey@users.noreply.github.com>
Co-authored by: Avi Weiss <thnkslprpt@users.noreply.github.com>
Co-authored by: Sam Price <thesamprice@users.noreply.github.com>
@jphickey jphickey deleted the fix-1433-fixedmap branch May 29, 2024 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OS_FileSysAddFixedMap should use the virtual vs physical path name
2 participants