diff options
| author | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-05-26 16:07:19 -0600 |
| commit | 39b815d02d7ce6af32bcf023d20243c404b75a84 (patch) | |
| tree | 68cd13fa83e90f69bf8c989fbcde768b676eb6d7 /fs | |
| parent | bab54f5942c428be698216224fd10b91d974d4da (diff) | |
| parent | 2ca1398a5ece8d33d8feb6b410e6e38588b5d2bc (diff) | |
Merge tag 'v2025.07-rc3' into next
Prepare v2025.07-rc3
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/Kconfig | 1 | ||||
| -rw-r--r-- | fs/ext4/ext4fs.c | 2 | ||||
| -rw-r--r-- | fs/fs_internal.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig index 1a913d2b6d2..8ddaebebd48 100644 --- a/fs/ext4/Kconfig +++ b/fs/ext4/Kconfig @@ -1,5 +1,6 @@ config FS_EXT4 bool "Enable ext4 filesystem support" + select CRC16 help This provides support for reading images from the ext4 filesystem. ext4 is a widely used general-purpose filesystem for Linux. diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index bd058a09614..51944b61bd0 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -102,7 +102,7 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos, blockcnt = lldiv(((len + pos) + blocksize - 1), blocksize); for (i = lldiv(pos, blocksize); i < blockcnt; i++) { - long int blknr; + lbaint_t blknr; int blockoff = pos - (blocksize * i); int blockend = blocksize; int skipfirst = 0; diff --git a/fs/fs_internal.c b/fs/fs_internal.c index ab4847ac257..ff27c564efc 100644 --- a/fs/fs_internal.c +++ b/fs/fs_internal.c @@ -28,7 +28,7 @@ int fs_devread(struct blk_desc *blk, struct disk_partition *partition, /* Check partition boundaries */ if ((sector + ((byte_offset + byte_len - 1) >> log2blksz)) >= partition->size) { - log_debug("read outside partition " LBAFU "\n", sector); + log_err("** Read outside partition " LBAFU "\n", sector); return 0; } |