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 <[email protected]>
---
 fs/erofs/super.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index e1020aa60771..4ca7ab4e1e82 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -313,8 +313,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);
        }
-- 
2.43.5


Reply via email to