c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-14 06:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a declaration position of the nth_page.

Browse Source 
Compilation time bug introduced by 87df5e4 commit.
Fix for the compilation error(Linux kernel 6.18.0):
"zfs/module/os/linux/zfs/abd_os.c:920:32: error: implicit declaration
of function ‘nth_page’; did you mean ‘pte_page’?
[-Werror=implicit-function-declaration]".

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Rob Norris <robn@despairlabs.com>
Signed-off-by: agiUnderground <alex.dev.cv@gmail.com>
Closes #18034
This commit is contained in:
Alex 2025-12-09 23:45:51 +00:00 committed by GitHub
parent a62c62120e
commit 104da9657a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/os/linux/zfs/abd_os.c
View File

@ -888,6 +888,14 @@ abd_iter_advance(struct abd_iter *aiter, size_t amount)
} }
} }
#ifndef nth_page
/*
* Since 6.18 nth_page() no longer exists, and is no longer required to iterate
* within a single SG entry, so we replace it with a simple addition.
*/
#define nth_page(p, n) ((p)+(n))
#endif
/* /*
* Map the current chunk into aiter. This can be safely called when the aiter * Map the current chunk into aiter. This can be safely called when the aiter
* has already exhausted, in which case this does nothing. * has already exhausted, in which case this does nothing.
@ -1123,14 +1131,6 @@ abd_return_buf_copy(abd_t *abd, void *buf, size_t n)
#define ABD_ITER_PAGE_SIZE(page) (PAGESIZE) #define ABD_ITER_PAGE_SIZE(page) (PAGESIZE)
#endif #endif
#ifndef nth_page
/*
* Since 6.18 nth_page() no longer exists, and is no longer required to iterate
* within a single SG entry, so we replace it with a simple addition.
*/
#define nth_page(p, n) ((p)+(n))
#endif
void void
abd_iter_page(struct abd_iter *aiter) abd_iter_page(struct abd_iter *aiter)
{ {