From 1c483cf3d0f5d6987677a17ce0a94d16d005bddb Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Wed, 16 Jul 2025 10:46:03 +1000 Subject: [PATCH] linux/kmem: remove long-obsolete __GFP compat flags Reviewed-by: Brian Behlendorf Reviewed-by: Alexander Motin Signed-off-by: Rob Norris Sponsored-by: https://despairlabs.com/sponsor/ Closes #17551 --- include/os/linux/spl/sys/kmem.h | 12 ------------ module/os/linux/zfs/abd_os.c | 4 ---- 2 files changed, 16 deletions(-) diff --git a/include/os/linux/spl/sys/kmem.h b/include/os/linux/spl/sys/kmem.h index 4c5baa331..3d624f38b 100644 --- a/include/os/linux/spl/sys/kmem.h +++ b/include/os/linux/spl/sys/kmem.h @@ -127,18 +127,6 @@ spl_fstrans_check(void) return (current->flags & SPL_FSTRANS); } -/* - * Kernel compatibility for GFP flags - */ -/* < 4.13 */ -#ifndef __GFP_RETRY_MAYFAIL -#define __GFP_RETRY_MAYFAIL __GFP_REPEAT -#endif -/* < 4.4 */ -#ifndef __GFP_RECLAIM -#define __GFP_RECLAIM __GFP_WAIT -#endif - #ifdef HAVE_ATOMIC64_T #define kmem_alloc_used_add(size) atomic64_add(size, &kmem_alloc_used) #define kmem_alloc_used_sub(size) atomic64_sub(size, &kmem_alloc_used) diff --git a/module/os/linux/zfs/abd_os.c b/module/os/linux/zfs/abd_os.c index e1140b31a..248c9b7a6 100644 --- a/module/os/linux/zfs/abd_os.c +++ b/module/os/linux/zfs/abd_os.c @@ -256,10 +256,6 @@ abd_unmark_zfs_page(struct page *page) #ifndef CONFIG_HIGHMEM -#ifndef __GFP_RECLAIM -#define __GFP_RECLAIM __GFP_WAIT -#endif - /* * The goal is to minimize fragmentation by preferentially populating ABDs * with higher order compound pages from a single zone. Allocation size is