projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c99fab6
)
erofs: fix block count report when 48-bit layout is on
author
Gao Xiang
<hsiangkao@linux.alibaba.com>
Thu, 7 Aug 2025 08:20:19 +0000
(16:20 +0800)
committer
Gao Xiang
<hsiangkao@linux.alibaba.com>
Sun, 10 Aug 2025 22:31:19 +0000
(06:31 +0800)
Fix incorrect shift order when combining the 48-bit block count.
Fixes:
2e1473d5195f
("erofs: implement 48-bit block addressing for unencoded inodes")
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link:
https://lore.kernel.org/r/20250807082019.3093539-1-hsiangkao@linux.alibaba.com
fs/erofs/super.c
patch
|
blob
|
history
diff --git
a/fs/erofs/super.c
b/fs/erofs/super.c
index
8c7a598
..
1b529ac
100644
(file)
--- a/
fs/erofs/super.c
+++ b/
fs/erofs/super.c
@@
-323,8
+323,8
@@
static int erofs_read_superblock(struct super_block *sb)
sbi->islotbits = ilog2(sizeof(struct erofs_inode_compact));
if (erofs_sb_has_48bit(sbi) && dsb->rootnid_8b) {
sbi->root_nid = le64_to_cpu(dsb->rootnid_8b);
- sbi->dif0.blocks =
(sbi->dif0.blocks << 32)
|
-
le16_to_cpu(dsb->rb.blocks_hi
);
+ sbi->dif0.blocks =
sbi->dif0.blocks
|
+
((u64)le16_to_cpu(dsb->rb.blocks_hi) << 32
);
} else {
sbi->root_nid = le16_to_cpu(dsb->rb.rootnid_2b);
}