storage: Try opening the slot-suffixed partition #27
Conversation
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
Some devices ship 2 copies of remote partitions (see e.g. linux-msm#22), which the current code can't cope with. Add parsing of a slot suffix (via '-S', single character) and if passed, retry opening partition (via a partlabel) with it. Signed-off-by: Konrad Dybcio <[email protected]>
quic-kdybcio
force-pushed
the
topic/slotsuffix
branch
from
0fc30d9 to
2ee01bf
Compare
lumag
requested changes
Jul 2, 2025
| @@ -26,7 +26,8 @@ ssize_t rmtfs_mem_write(struct rmtfs_mem *rmem, unsigned long phys_address, cons | |||
| struct rmtfd; | |||
|
|
|||
| int storage_init(const char *storage_root, bool read_only, bool use_partitions); | |||
| struct rmtfd *storage_open(unsigned node, const char *path); | |||
| #define SLOT_SUFFIX_LEN (2 + 1) /* "_a" or "_b", null-terminated */ | |||
| @@ -535,6 +536,20 @@ int main(int argc, char **argv) | |||
|
|
|||
| break; | |||
|
|
|||
| /* Partlabel slot suffix on A/B devices */ | |||
| case 'S': | |||
| if (strnlen(optarg, 1 + 1) != 1) { | |||
There was a problem hiding this comment.
I'd say, let users pass the complete suffix, like '_a', '_b', '_some_user_idea', etc. There is no need to limit it.
There was a problem hiding this comment.
I'd prefer to limit it to what Android expects.. otherwise we'll have to make up for it in all of our other software as well
| return -1; | ||
| } | ||
|
|
||
| ret = snprintf(slot_suffix, SLOT_SUFFIX_LEN, "_%s", optarg); |
There was a problem hiding this comment.
asnprintf is your friend if you insist
| @@ -27,6 +27,7 @@ | |||
|
|
|||
| static struct rmtfs_mem *rmem; | |||
| static sig_atomic_t sig_int_count; | |||
| static char slot_suffix[SLOT_SUFFIX_LEN]; | |||
There was a problem hiding this comment.
char * would be a better fit. Not need to be len-picky.
There was a problem hiding this comment.
I found it neater not to sprinkle free/gotos all over the program
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.
Some devices ship 2 copies of remote partitions (see e.g. #22), which the current code can't cope with.
Add parsing of a slot suffix (via '-S', single character) and if passed, retry opening partition (via a partlabel) with it.