Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Move GFP flags kernel compatibility code 

Move the GFP flags kernel compat code from c file to kmem header.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Closes #10424
This commit is contained in:
Michael Niewöhner 2020-06-09 01:33:46 +02:00 committed by GitHub
parent 080102a1b6
commit 32f26eaa70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/os/linux/spl/sys/kmem.h
View File

@ -144,6 +144,18 @@ __spl_pf_fstrans_check(void)
return (current->flags & __SPL_PF_FSTRANS); return (current->flags & __SPL_PF_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 #ifdef HAVE_ATOMIC64_T
#define kmem_alloc_used_add(size) atomic64_add(size, &kmem_alloc_used) #define kmem_alloc_used_add(size) atomic64_add(size, &kmem_alloc_used)
#define kmem_alloc_used_sub(size) atomic64_sub(size, &kmem_alloc_used) #define kmem_alloc_used_sub(size) atomic64_sub(size, &kmem_alloc_used)

9
module/os/linux/spl/spl-kmem.c
View File

@ -132,15 +132,6 @@ kmem_strfree(char *str)
} }
EXPORT_SYMBOL(kmem_strfree); EXPORT_SYMBOL(kmem_strfree);
/* Kernel compatibility for <4.13 */
#ifndef __GFP_RETRY_MAYFAIL
#define __GFP_RETRY_MAYFAIL __GFP_REPEAT
#endif
/* Kernel compatibility for <4.4 */
#ifndef __GFP_RECLAIM
#define __GFP_RECLAIM __GFP_WAIT
#endif
void * void *
spl_kvmalloc(size_t size, gfp_t lflags) spl_kvmalloc(size_t size, gfp_t lflags)
{ {