Align with the block size of overlayBD #352
Merged
Conversation
This file contains 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
Rename `cfg` to `mkfs_cfg` to avoid confusion, as there is also a global `cfg` in liberofs. Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
Currently, the error code returned by the earlier part of the extract_tar() may be overwritten by value of erofs_close_sbi(). This patch introduces `err2` to address this issue. Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
|
@hsiangkao PLTAL |
hsiangkao
reviewed
Nov 13, 2024
src/overlaybd/tar/erofs/liberofs.cpp
Outdated
| @@ -580,20 +580,27 @@ static int erofs_init_tar(struct erofs_tarfile *erofstar, | |||
| static int erofs_write_map_file(photon::fs::IFile *fout, uint64_t blksz, FILE *fp) | |||
| { | |||
| uint64_t blkaddr, toff; | |||
| uint32_t nblocks; | |||
| uint32_t nblocks, zeroedlen; | |||
| char line[blksz]; | |||
There was a problem hiding this comment.
Done. getline() is used to read a line instead of fgets().
hsiangkao
reviewed
Nov 13, 2024
src/overlaybd/tar/erofs/liberofs.cpp
Outdated
| LSMT::RemoteMapping lba; | ||
|
|
||
| cnt = sscanf(line, "%" PRIx64" %x %" PRIx64 "%u\n", &blkaddr, &nblocks, &toff, &zeroedlen); |
There was a problem hiding this comment.
maybe "%" PRIx64 "%x%" PRIx64 "%u" is enough?
hsiangkao
reviewed
Nov 13, 2024
| LSMT::RemoteMapping lba; | ||
|
|
||
| cnt = sscanf(line, "%" PRIx64" %x%" PRIx64 "%u", &blkaddr, &nblocks, &toff, &zeroedlen); | ||
|
|
There was a problem hiding this comment.
I think you also need to bail out if (cnt < 3) and print some error messages.
if (cnt < 3) {
some messages here.
break;
}
There was a problem hiding this comment.
Yes, that's better. Done.
The inconsistency in the default block sizes between OverlayBD and EROFS can lead to issues during segment mapping. This patch aligns with the block size of overlaybd for mapping (i.e., OverlayBD's 512-byte size) to overcome this inconsistency. Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
hsiangkao
approved these changes
Nov 13, 2024
|
thanks |
hsiangkao
reviewed
Nov 13, 2024
| int nwrite = fout->ioctl(LSMT::IFileRW::RemoteData, lba); | ||
| if ((unsigned) nwrite != lba.count) { | ||
| LOG_ERRNO_RETURN(0, -1, "failed to write lba"); | ||
| } | ||
| } | ||
| free(line); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does / why we need it:
The inconsistency in the default block sizes between OverlayBD and EROFS can lead to issues during segment mapping. This patch aligns with the block size of overlaybd for mapping (i.e., OverlayBD's 512-byte size) to overcome this inconsistency.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Please check the following list: