meta-starlingx/meta-stx-integ/recipes-support/drbd/drbd-utils/0006-avoid-kernel-userspace-version-check.patch

   1 From ea19e3020367cfaf6da20dd690433ee72a24120c Mon Sep 17 00:00:00 2001
   2 From: Don Penney <don.penney@windriver.com>
   3 Date: Mon, 2 May 2016 15:17:54 -0400
   4 Subject: [PATCH 1/1] Avoid kernel/userspace version check
   5
   6 ---
   7  user/drbdadm_usage_cnt.c | 32 +-------------------------------
   8  1 file changed, 1 insertion(+), 31 deletions(-)
   9
  10 diff --git a/user/drbdadm_usage_cnt.c b/user/drbdadm_usage_cnt.c
  11 index ff6d5c8..c6cb4ad 100644
  12 --- a/user/drbdadm_usage_cnt.c
  13 +++ b/user/drbdadm_usage_cnt.c
  14 @@ -244,37 +244,7 @@ static int vcs_ver_cmp(struct vcs_rel *rev1, struct vcs_rel *rev2)
  15
  16  void warn_on_version_mismatch(void)
  17  {
  18 -       char *msg;
  19 -       int cmp;
  20 -
  21 -       /* get the kernel module version from /proc/drbd */
  22 -       vcs_get_current();
  23 -
  24 -       /* get the userland version from REL_VERSION */
  25 -       vcs_get_userland();
  26 -
  27 -       cmp = vcs_ver_cmp(&userland_version, &current_vcs_rel);
  28 -       /* no message if equal */
  29 -       if (cmp == 0)
  30 -               return;
  31 -       if (cmp > 0xffff || cmp < -0xffff)       /* major version differs! */
  32 -               msg = "mixing different major numbers will not work!";
  33 -       else if (cmp < 0)               /* userland is older. always warn. */
  34 -               msg = "you should upgrade your drbd tools!";
  35 -       else if (cmp & 0xff00)          /* userland is newer minor version */
  36 -               msg = "please don't mix different DRBD series.";
  37 -       else            /* userland is newer, but only differ in sublevel. */
  38 -               msg = "preferably kernel and userland versions should match.";
  39 -
  40 -       fprintf(stderr, "DRBD module version: %u.%u.%u\n"
  41 -                       "   userland version: %u.%u.%u\n%s\n",
  42 -                       current_vcs_rel.version.major,
  43 -                       current_vcs_rel.version.minor,
  44 -                       current_vcs_rel.version.sublvl,
  45 -                       userland_version.version.major,
  46 -                       userland_version.version.minor,
  47 -                       userland_version.version.sublvl,
  48 -                       msg);
  49 +       return;
  50  }
  51
  52  void add_lib_drbd_to_path(void)
  53 --
  54 1.8.3.1
  55