forked from pool/openafs
d7141e7dbb
- change version to openafs-1.8.12-g... since the new stable release is 1.8.12 - apply intermediate patches for kernel 6.10 * 03b280649f5e22ed74c217d7c98c3416a2fa9052: Linux-6.10: remove includes for asm/ia32_unistd.h * 0f6a3a402f4a66114da9231032bd68cdc4dee7bc: Linux-6.10: Use filemap_alloc_folio when avail * 658942f2791fad5e33ec7542158c16dfc66eed39: Linux-6.10: define a wrapper for vmalloc * d8b56f21994ce66d8daebb7d69e792f34c1a19ed: afs: avoid empty-body warning * 7097eec17bc01bcfc12c4d299136b2d3b94ec3d7: Linux 6.10: Move 'inline' before func return type OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=127
52 lines
1.8 KiB
Plaintext
52 lines
1.8 KiB
Plaintext
commit 7097eec17bc01bcfc12c4d299136b2d3b94ec3d7
|
||
Author: Cheyenne Wills <cwills@sinenomine.net>
|
||
Date: Thu Jun 6 10:42:57 2024 -0600
|
||
|
||
Linux 6.10: Move 'inline' before func return type
|
||
|
||
With Linux 6.10 commit:
|
||
"kbuild: turn on -Wextra by default" (f5982cceb3)
|
||
there are additional compiler warnings that can turn
|
||
into build errors when --enable-checking is used.
|
||
|
||
"error: ‘inline’ is not at beginning of declaration
|
||
[-Werror=old-style-declaration]"
|
||
|
||
The error is due to the return type preceding the "inline" keyword
|
||
in function declarations.
|
||
|
||
Fix the declarations for file_can_read_pages() and
|
||
afs_linux_readpage_fastpath() to have the proper ordering of the
|
||
static/inline keywords attributes so they precede the return type.
|
||
|
||
Just a note that the `static` and `inline` keywords must precede a
|
||
function's return type.
|
||
|
||
Change-Id: I3ff9d45c119e70a90faf18fbf6d49fb6b9adcf33
|
||
Reviewed-on: https://gerrit.openafs.org/15768
|
||
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
|
||
Tested-by: Andrew Deason <adeason@sinenomine.net>
|
||
|
||
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
|
||
index 18809c89f..c6c3bfe39 100644
|
||
--- a/src/afs/LINUX/osi_vnodeops.c
|
||
+++ b/src/afs/LINUX/osi_vnodeops.c
|
||
@@ -2443,7 +2443,7 @@ afs_linux_read_cache(struct file *cachefp, struct page *page,
|
||
/*
|
||
* Return true if the file has a mapping that can read pages
|
||
*/
|
||
-static int inline
|
||
+static inline int
|
||
file_can_read_pages(struct file *fp)
|
||
{
|
||
#if defined(STRUCT_ADDRESS_SPACE_OPERATIONS_HAS_READ_FOLIO)
|
||
@@ -2456,7 +2456,7 @@ file_can_read_pages(struct file *fp)
|
||
return 0;
|
||
}
|
||
|
||
-static int inline
|
||
+static inline int
|
||
afs_linux_readpage_fastpath(struct file *fp, struct page *pp, int *codep)
|
||
{
|
||
loff_t offset = page_offset(pp);
|