[Drbd-dev] [PATCH drbd-9.0] compat: __vmalloc() pgprot argument was removed in v5.8

Elimar Riesebieter riesebie at lxtec.de
Sun Oct 11 20:39:30 CEST 2020


* Lukas Wunner <lukas at wunner.de> [2020-10-11 18:07 +0200]:

> Commit torvalds/linux at 88dca4ca5a93 removed the pgprot argument from
> __vmalloc().  There's a single invocation in drbd_bitmap.c.  Drop the
> argument to stay as close as possible to upstream and apply a cocci
> patch for older kernels which reinstates the additional argument.
> 
> Reported-by: Michael Hierweck <michael.hierweck at hostsharing.net>
> Signed-off-by: Lukas Wunner <lukas at wunner.de>
> ---
>  drbd/drbd-kernel-compat/cocci/__vmalloc__no_has_2_params.cocci | 3 +++
>  drbd/drbd-kernel-compat/gen_patch_names.c                      | 3 +++
>  drbd/drbd-kernel-compat/tests/__vmalloc_has_2_params.c         | 8 ++++++++
>  drbd/drbd_bitmap.c                                             | 3 +--

Applied that patch to tag 9.0.25-1. Building the module via dkms
gives:

/var/lib/dkms/drbd/9.0.25-1hsh2/build/src/drbd/drbd_bitmap.c: In function ‘bm_realloc_pages’:
/var/lib/dkms/drbd/9.0.25-1hsh2/build/src/drbd/drbd_bitmap.c:368:15: error: too few arguments to function ‘__vmalloc’
   new_pages = __vmalloc(bytes,
               ^~~~~~~~~
In file included from /var/lib/dkms/drbd/9.0.25-1hsh2/build/src/drbd/drbd_bitmap.c:16:
/usr/src/linux-headers-4.19.0-9-common/include/linux/vmalloc.h:80:14: note: declared here
 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
              ^~~~~~~~~

Elimar
-- 
  Numeric stability is probably not all that
  important when you're guessing;-)



More information about the drbd-dev mailing list