|
 |
112869 |
From 83b3de7795d2a421eb6ae4ab97656a250bb898ea Mon Sep 17 00:00:00 2001
|
|
|
112869 |
From: Xiao Ni <xni@redhat.com>
|
|
|
112869 |
Date: Fri, 23 Apr 2021 14:01:30 +0800
|
|
|
112869 |
Subject: [PATCH 1/2] Fix some building errors
|
|
|
112869 |
|
|
|
112869 |
There are some building errors if treating warning as errors.
|
|
|
112869 |
Fix them in this patch.
|
|
|
112869 |
|
|
|
112869 |
Signed-off-by: Xiao Ni <xni@redhat.com>
|
|
|
112869 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
112869 |
---
|
|
|
112869 |
super-intel.c | 6 +++---
|
|
|
112869 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
112869 |
|
|
|
112869 |
diff --git a/super-intel.c b/super-intel.c
|
|
|
112869 |
index be0313d..5469912 100644
|
|
|
112869 |
--- a/super-intel.c
|
|
|
112869 |
+++ b/super-intel.c
|
|
|
112869 |
@@ -3192,7 +3192,7 @@ static int imsm_create_metadata_checkpoint_update(
|
|
|
112869 |
}
|
|
|
112869 |
(*u)->type = update_general_migration_checkpoint;
|
|
|
112869 |
(*u)->curr_migr_unit = current_migr_unit(super->migr_rec);
|
|
|
112869 |
- dprintf("prepared for %llu\n", (*u)->curr_migr_unit);
|
|
|
112869 |
+ dprintf("prepared for %llu\n", (unsigned long long)(*u)->curr_migr_unit);
|
|
|
112869 |
|
|
|
112869 |
return update_memory_size;
|
|
|
112869 |
}
|
|
|
112869 |
@@ -11127,7 +11127,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
|
|
|
112869 |
skipped_disks++;
|
|
|
112869 |
continue;
|
|
|
112869 |
}
|
|
|
112869 |
- if (read(dl_disk->fd, buf, unit_len) != unit_len) {
|
|
|
112869 |
+ if (read(dl_disk->fd, buf, unit_len) != (ssize_t)unit_len) {
|
|
|
112869 |
pr_err("Cannot read copy area block: %s\n",
|
|
|
112869 |
strerror(errno));
|
|
|
112869 |
skipped_disks++;
|
|
|
112869 |
@@ -11139,7 +11139,7 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
|
|
|
112869 |
skipped_disks++;
|
|
|
112869 |
continue;
|
|
|
112869 |
}
|
|
|
112869 |
- if (write(dl_disk->fd, buf, unit_len) != unit_len) {
|
|
|
112869 |
+ if (write(dl_disk->fd, buf, unit_len) != (ssize_t)unit_len) {
|
|
|
112869 |
pr_err("Cannot restore block: %s\n",
|
|
|
112869 |
strerror(errno));
|
|
|
112869 |
skipped_disks++;
|
|
|
112869 |
--
|
|
|
112869 |
2.7.5
|
|
|
112869 |
|