]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
md/md-cluster: fix spares warnings for __le64
authorYu Kuai <yukuai3@huawei.com>
Mon, 26 Aug 2024 07:44:15 +0000 (15:44 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 27 Feb 2025 12:10:44 +0000 (04:10 -0800)
[ Upstream commit 82697ccf7e495c1ba81e315c2886d6220ff84c2c ]

drivers/md/md-cluster.c:1220:22: warning: incorrect type in assignment (different base types)
drivers/md/md-cluster.c:1220:22:    expected unsigned long my_sync_size
drivers/md/md-cluster.c:1220:22:    got restricted __le64 [usertype] sync_size
drivers/md/md-cluster.c:1252:35: warning: incorrect type in assignment (different base types)
drivers/md/md-cluster.c:1252:35:    expected unsigned long sync_size
drivers/md/md-cluster.c:1252:35:    got restricted __le64 [usertype] sync_size
drivers/md/md-cluster.c:1253:41: warning: restricted __le64 degrades to integer

Fix the warnings by using le64_to_cpu() to convet __le64 to integer.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240826074452.1490072-6-yukuai1@huaweicloud.com
Signed-off-by: Song Liu <song@kernel.org>
Stable-dep-of: 8d28d0ddb986 ("md/md-bitmap: Synchronize bitmap_get_stats() with bitmap lifetime")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/md-cluster.c

index 1e26eb22334950c45b1510795b6172b3b1a94385..ca4d3a8d5dd761804b08012c5a3847e09e3ecf38 100644 (file)
@@ -1200,7 +1200,7 @@ static int cluster_check_sync_size(struct mddev *mddev)
        struct dlm_lock_resource *bm_lockres;
 
        sb = kmap_atomic(bitmap->storage.sb_page);
-       my_sync_size = sb->sync_size;
+       my_sync_size = le64_to_cpu(sb->sync_size);
        kunmap_atomic(sb);
 
        for (i = 0; i < node_num; i++) {
@@ -1232,8 +1232,8 @@ static int cluster_check_sync_size(struct mddev *mddev)
 
                sb = kmap_atomic(bitmap->storage.sb_page);
                if (sync_size == 0)
-                       sync_size = sb->sync_size;
-               else if (sync_size != sb->sync_size) {
+                       sync_size = le64_to_cpu(sb->sync_size);
+               else if (sync_size != le64_to_cpu(sb->sync_size)) {
                        kunmap_atomic(sb);
                        md_bitmap_free(bitmap);
                        return -1;