Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6561b85f authored Aug 03, 2022 by Treehugger Robot Committed by Automerger Merge Worker Aug 03, 2022

Merge "storageproxy: Support POST_COMMIT sync for all commands" am: eb9780fe

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2166468

Change-Id: I60dcd666bc823b539feaaadf3cf95a7572d551dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bdfa0fa2 eb9780fe

trusty/storage/proxy/proxy.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -73,10 +73,11 @@ static void show_usage_and_exit(int code) {
		static int handle_req(struct storage_msg* msg, const void* req, size_t req_len) {
		int rc;

		if ((msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) && (msg->cmd != STORAGE_RPMB_SEND)) {
		if ((msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) && msg->cmd != STORAGE_RPMB_SEND &&
		msg->cmd != STORAGE_FILE_WRITE) {
		/*
		* handling post commit messages on non rpmb commands are not
		* implemented as there is no use case for this yet.
		* handling post commit messages on commands other than rpmb and write
		* operations are not implemented as there is no use case for this yet.
		*/
		ALOGE("cmd 0x%x: post commit option is not implemented\n", msg->cmd);
		msg->result = STORAGE_ERR_UNIMPLEMENTED;

trusty/storage/proxy/storage.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -407,6 +407,14 @@ int storage_file_write(struct storage_msg *msg,
		goto err_response;
		}

		if (msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) {
		rc = storage_sync_checkpoint();
		if (rc < 0) {
		msg->result = STORAGE_ERR_GENERIC;
		goto err_response;
		}
		}

		msg->result = STORAGE_NO_ERROR;

		err_response: