diff options
| author |   Gao Xiang <hsiangkao@linux.alibaba.com> | 2025-08-07 16:20:19 +0800 |
|---|---|---|
| committer | Gao Xiang <hsiangkao@linux.alibaba.com> | 2025-08-11 06:31:19 +0800 |
| commit | 0b96d9bed324a1c1b7d02bfb9596351ef178428d (patch) | |
| tree | 926490010a6b0485f988674b58431227d093a045 | |
| parent | erofs: fix atomic context detection when !CONFIG_DEBUG_LOCK_ALLOC (diff) | |
| download | wireguard-linux-0b96d9bed324a1c1b7d02bfb9596351ef178428d.tar.xz wireguard-linux-0b96d9bed324a1c1b7d02bfb9596351ef178428d.zip | |
erofs: fix block count report when 48-bit layout is on
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
| -rw-r--r-- | fs/erofs/super.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8c7a5985b4ee..1b529ace4db0 100644 --- 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); } |