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

Commit 6e48a1e5 authored Aug 04, 2022 by Stephen Crane Committed by Automerger Merge Worker Aug 04, 2022

storageproxy: Report fsync failures with a distinct error code am: cf458bae

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

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

parents 19ddf449 cf458bae

trusty/storage/interface/include/trusty/interface/storage.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,9 @@ enum storage_cmd {
		* @STORAGE_ERR_TRANSACT returned by various operations to indicate that current transaction
		* is in error state. Such state could be only cleared by sending
		* STORAGE_END_TRANSACTION message.
		* @STORAGE_ERR_SYNC_FAILURE indicates that the current operation failed to sync
		* to disk. Only returned if STORAGE_MSG_FLAG_PRE_COMMIT or
		* STORAGE_MSG_FLAG_POST_COMMIT was set for the request.
		*/
		enum storage_err {
		STORAGE_NO_ERROR = 0,
		@@ -80,6 +83,7 @@ enum storage_err {
		STORAGE_ERR_NOT_FOUND = 5,
		STORAGE_ERR_EXIST = 6,
		STORAGE_ERR_TRANSACT = 7,
		STORAGE_ERR_SYNC_FAILURE = 8,
		};

		/**

trusty/storage/proxy/proxy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ static int handle_req(struct storage_msg* msg, const void* req, size_t req_len)
		if (msg->flags & STORAGE_MSG_FLAG_PRE_COMMIT) {
		rc = storage_sync_checkpoint();
		if (rc < 0) {
		msg->result = STORAGE_ERR_GENERIC;
		msg->result = STORAGE_ERR_SYNC_FAILURE;
		return ipc_respond(msg, NULL, 0);
		}
		}

trusty/storage/proxy/storage.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -410,7 +410,7 @@ int storage_file_write(struct storage_msg *msg,
		if (msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) {
		rc = storage_sync_checkpoint();
		if (rc < 0) {
		msg->result = STORAGE_ERR_GENERIC;
		msg->result = STORAGE_ERR_SYNC_FAILURE;
		goto err_response;
		}
		}