michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt: mcumgr: grp: fs_mgmt: Update file upload errors

Browse source 
Updates possible return errors for fs mgmt file upload, to clarify
when a provided path is on a read-only filesystem or if the mount
point does not exist.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
This commit is contained in:
Jamie McCrae 2023-09-12 11:46:57 +01:00 • committed by Carles Cufí
commit 0d5c508fc7
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h
View file

@ -73,6 +73,12 @@ enum fs_mgmt_err_code_t {
/** The requested checksum or hash type was not found or is not supported by this build. */ /** The requested checksum or hash type was not found or is not supported by this build. */
FS_MGMT_ERR_CHECKSUM_HASH_NOT_FOUND, FS_MGMT_ERR_CHECKSUM_HASH_NOT_FOUND,
/** The specified mount point was not found or is not mounted. */
FS_MGMT_ERR_MOUNT_POINT_NOT_FOUND,
/** The specified mount point is that of a read-only filesystem. */
FS_MGMT_ERR_READ_ONLY_FILESYSTEM,
}; };
#ifdef __cplusplus #ifdef __cplusplus

16
subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c
View file

@ -425,7 +425,9 @@ static int fs_mgmt_file_upload(struct smp_streamer *ctxt)
if (rc == -EINVAL) { if (rc == -EINVAL) {
rc = FS_MGMT_ERR_FILE_INVALID_NAME; rc = FS_MGMT_ERR_FILE_INVALID_NAME;
} else if (rc == -ENOENT) { } else if (rc == -ENOENT) {
rc = FS_MGMT_ERR_FILE_NOT_FOUND; rc = FS_MGMT_ERR_MOUNT_POINT_NOT_FOUND;
} else if (rc == -EROFS) {
rc = FS_MGMT_ERR_READ_ONLY_FILESYSTEM;
} else { } else {
rc = FS_MGMT_ERR_UNKNOWN; rc = FS_MGMT_ERR_UNKNOWN;
} }
@ -909,7 +911,18 @@ static int fs_mgmt_translate_error_code(uint16_t err)
int rc; int rc;
switch (err) { switch (err) {
case FS_MGMT_ERR_FILE_INVALID_NAME:
case FS_MGMT_ERR_CHECKSUM_HASH_NOT_FOUND:
rc = MGMT_ERR_EINVAL;
break;
case FS_MGMT_ERR_FILE_NOT_FOUND:
case FS_MGMT_ERR_MOUNT_POINT_NOT_FOUND:
rc = MGMT_ERR_ENOENT;
break;
case FS_MGMT_ERR_UNKNOWN: case FS_MGMT_ERR_UNKNOWN:
case FS_MGMT_ERR_FILE_IS_DIRECTORY:
case FS_MGMT_ERR_FILE_OPEN_FAILED: case FS_MGMT_ERR_FILE_OPEN_FAILED:
case FS_MGMT_ERR_FILE_SEEK_FAILED: case FS_MGMT_ERR_FILE_SEEK_FAILED:
case FS_MGMT_ERR_FILE_READ_FAILED: case FS_MGMT_ERR_FILE_READ_FAILED:
@ -918,6 +931,7 @@ static int fs_mgmt_translate_error_code(uint16_t err)
case FS_MGMT_ERR_FILE_WRITE_FAILED: case FS_MGMT_ERR_FILE_WRITE_FAILED:
case FS_MGMT_ERR_FILE_OFFSET_NOT_VALID: case FS_MGMT_ERR_FILE_OFFSET_NOT_VALID:
case FS_MGMT_ERR_FILE_OFFSET_LARGER_THAN_FILE: case FS_MGMT_ERR_FILE_OFFSET_LARGER_THAN_FILE:
case FS_MGMT_ERR_READ_ONLY_FILESYSTEM:
default: default:
rc = MGMT_ERR_EUNKNOWN; rc = MGMT_ERR_EUNKNOWN;
} }