b24095eccc
- Upversion code tar from 8.4 to 9.15
- Modify drbd.spec to apply code patches
- Porting 8.4 code patches to 9.15
(Combine several current patches by target file)
Test
- drbd resize operation. Ensure no outstanding alarms
and drbd-overview indicates insync; and 'sudo lvs'
indicates resized correctly
- drbd resize operation prior to upgrade and then
performing the upgrade.
e.g. drbd may be resized via
'system controllerfs-modify etcd=<largervalue>',
when both controllers are
unlocked-enabled-available
Story: 2009067
Task: 42873
Depends-On: https://review.opendev.org/806736
Signed-off-by: Takamasa Takenaka <takamasa.takenaka@windriver.com>
Change-Id: I25cb46e4b77f90c91d5d7e4dcfa79125776163d1
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
diff --git a/user/v84/drbdadm_usage_cnt.c b/user/v84/drbdadm_usage_cnt.c
|
|
index 53bc9bc..0bd2ff3 100644
|
|
--- a/user/v84/drbdadm_usage_cnt.c
|
|
+++ b/user/v84/drbdadm_usage_cnt.c
|
|
@@ -244,37 +244,7 @@ static int vcs_ver_cmp(struct vcs_rel *rev1, struct vcs_rel *rev2)
|
|
|
|
void warn_on_version_mismatch(void)
|
|
{
|
|
- char *msg;
|
|
- int cmp;
|
|
-
|
|
- /* get the kernel module version from /proc/drbd */
|
|
- vcs_get_current();
|
|
-
|
|
- /* get the userland version from PACKAGE_VERSION */
|
|
- vcs_get_userland();
|
|
-
|
|
- cmp = vcs_ver_cmp(&userland_version, ¤t_vcs_rel);
|
|
- /* no message if equal */
|
|
- if (cmp == 0)
|
|
- return;
|
|
- if (cmp > 0xffff || cmp < -0xffff) /* major version differs! */
|
|
- msg = "mixing different major numbers will not work!";
|
|
- else if (cmp < 0) /* userland is older. always warn. */
|
|
- msg = "you should upgrade your drbd tools!";
|
|
- else if (cmp & 0xff00) /* userland is newer minor version */
|
|
- msg = "please don't mix different DRBD series.";
|
|
- else /* userland is newer, but only differ in sublevel. */
|
|
- msg = "preferably kernel and userland versions should match.";
|
|
-
|
|
- fprintf(stderr, "DRBD module version: %u.%u.%u\n"
|
|
- " userland version: %u.%u.%u\n%s\n",
|
|
- current_vcs_rel.version.major,
|
|
- current_vcs_rel.version.minor,
|
|
- current_vcs_rel.version.sublvl,
|
|
- userland_version.version.major,
|
|
- userland_version.version.minor,
|
|
- userland_version.version.sublvl,
|
|
- msg);
|
|
+ return;
|
|
}
|
|
|
|
void add_lib_drbd_to_path(void)
|