-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extra ext4 fixes to XU4 default u-boot
- Loading branch information
1 parent
a8ee68a
commit 6f70bd9
Showing
1 changed file
with
59 additions
and
0 deletions.
There are no files selected for viewing
59 changes: 59 additions & 0 deletions
59
patch/u-boot/u-boot-odroidxu-default/ext4-fixes-pr-28.patch
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c | ||
index 083e45e..9af7448 100644 | ||
--- a/fs/ext4/ext4_common.c | ||
+++ b/fs/ext4/ext4_common.c | ||
@@ -1415,12 +1415,13 @@ static struct ext4_extent_header *ext4fs_get_extent_block | ||
struct ext4_extent_idx *index; | ||
unsigned long long block; | ||
struct ext_filesystem *fs = get_fs(); | ||
+ int blksz = EXT2_BLOCK_SIZE(data); | ||
int i; | ||
|
||
while (1) { | ||
index = (struct ext4_extent_idx *)(ext_block + 1); | ||
|
||
- if (le32_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC) | ||
+ if (le16_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC) | ||
return 0; | ||
|
||
if (ext_block->eh_depth == 0) | ||
@@ -1428,17 +1429,17 @@ static struct ext4_extent_header *ext4fs_get_extent_block | ||
i = -1; | ||
do { | ||
i++; | ||
- if (i >= le32_to_cpu(ext_block->eh_entries)) | ||
+ if (i >= le16_to_cpu(ext_block->eh_entries)) | ||
break; | ||
- } while (fileblock > le32_to_cpu(index[i].ei_block)); | ||
+ } while (fileblock >= le32_to_cpu(index[i].ei_block)); | ||
|
||
if (--i < 0) | ||
return 0; | ||
|
||
- block = le32_to_cpu(index[i].ei_leaf_hi); | ||
+ block = le16_to_cpu(index[i].ei_leaf_hi); | ||
block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo); | ||
|
||
- if (ext4fs_devread(block << log2_blksz, 0, fs->blksz, buf)) | ||
+ if (ext4fs_devread(block << log2_blksz, 0, blksz, buf)) | ||
ext_block = (struct ext4_extent_header *)buf; | ||
else | ||
return 0; | ||
@@ -1529,7 +1530,7 @@ long int read_allocated_block(struct ext2_inode *inode, int fileblock) | ||
|
||
do { | ||
i++; | ||
- if (i >= le32_to_cpu(ext_block->eh_entries)) | ||
+ if (i >= le16_to_cpu(ext_block->eh_entries)) | ||
break; | ||
} while (fileblock >= le32_to_cpu(extent[i].ee_block)); | ||
if (--i >= 0) { | ||
@@ -1539,7 +1540,7 @@ long int read_allocated_block(struct ext2_inode *inode, int fileblock) | ||
return 0; | ||
} | ||
|
||
- start = le32_to_cpu(extent[i].ee_start_hi); | ||
+ start = le16_to_cpu(extent[i].ee_start_hi); | ||
start = (start << 32) + | ||
le32_to_cpu(extent[i].ee_start_lo); | ||
free(buf); |